xdebug-not-done -> xdebug

facebook · Sep 18, 2014 · b171ba2 · b171ba2
1 parent 8f19c74
commit b171ba2
Show file tree

Hide file tree

Showing 57 changed files with 136 additions and 135 deletions.
diff --git a/hphp/runtime/ext/xdebug/ext_xdebug.cpp b/hphp/runtime/ext/xdebug/ext_xdebug.cpp
@@ -745,8 +745,10 @@ static void loadEnvConfig(map<string, string>& envCfg) {
 }
 
 void XDebugExtension::moduleLoad(const IniSetting::Map& ini, Hdf xdebug_hdf) {
-  Hdf hdf = xdebug_hdf[XDEBUG_NAME];
-  Enable = Config::GetBool(ini, hdf["enable"], false);
+  const auto* ini_val = ini.get_ptr(XDEBUG_INI("enable"));
+  if (ini_val != nullptr) {
+    ini_on_update(*ini_val, Enable);
+  }
 }
 
 void XDebugExtension::moduleInit() {
@@ -826,7 +828,7 @@ void XDebugExtension::requestInit() {
   XDEBUG_CFG
   #undef XDEBUG_OPT
 
-  // hhvm.xdebug.dump.*
+  // xdebug.dump.*
   #define XDEBUG_OPT(T, name, sym, val) { \
     XDEBUG_GLOBAL(sym) = xdebug_init_opt<T>(name, val, env_cfg); \
     IniSetting::Bind(this, IniSetting::PHP_INI_ALL, \

diff --git a/hphp/runtime/ext/xdebug/ext_xdebug.h b/hphp/runtime/ext/xdebug/ext_xdebug.h
@@ -30,7 +30,7 @@ struct XDebugServer;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#define XDEBUG_NAME "xdebug-not-done"
+#define XDEBUG_NAME "xdebug"
 #define XDEBUG_VERSION NO_EXTENSION_VERSION_YET
 #define XDEBUG_AUTHOR "HHVM"
 #define XDEBUG_COPYRIGHT  "Copyright (c) 2002-2013 by Derick Rethans"
@@ -165,8 +165,7 @@ struct XDebugServer;
 #define XDEBUG_GLOBAL(name) (*XDebugExtension::name)
 
 // Returns the ini name for the given hhvm configuration option.
-// TODO(#3704) This should not be hhvm. Need to change tests.
-#define XDEBUG_INI(name) (("hhvm." XDEBUG_NAME ".") + string(name))
+#define XDEBUG_INI(name) ((XDEBUG_NAME ".") + string(name))
 
 // TODO(#3704) Remove when xdebug fully implemented
 #define XDEBUG_NOTIMPLEMENTED  { throw_not_implemented(__FUNCTION__); }

diff --git a/hphp/runtime/ext/xdebug/xdebug_profiler.cpp b/hphp/runtime/ext/xdebug/xdebug_profiler.cpp
@@ -46,9 +46,9 @@ void XDebugProfiler::ensureBufferSpace() {
   } catch (const OutOfMemoryException& e) {
     raise_error("Cannot allocate more memory for the xdebug profiler. Consider "
                 "turning off profiling or tracing. Note that certain ini "
-                "settings such as hhvm.xdebug.collect_memory and "
-                "hhvm.xdebug.collect_time implicitly "
-                "turn on tracing, so turn those off if this is unexpected.\n"
+                "settings such as xdebug.collect_memory and "
+                "xdebug.collect_time implicitly turn on tracing, so turn those "
+                " off if this is unexpected.\n"
                 "Current frame buffer length: %zu\n"
                 "Failed to expand to length: %zu\n",
                 m_frameBufferSize,

diff --git a/hphp/test/slow/ext_xdebug/call_class.php.ini b/hphp/test/slow/ext_xdebug/call_class.php.ini
@@ -1 +1 @@
-hhvm.xdebug-not-done.enable = 1
+xdebug.enable = 1
diff --git a/hphp/test/slow/ext_xdebug/call_function.php.ini b/hphp/test/slow/ext_xdebug/call_function.php.ini
@@ -1 +1 @@
-hhvm.xdebug-not-done.enable = 1
+xdebug.enable = 1
diff --git a/hphp/test/slow/ext_xdebug/call_function_helper.php.ini b/hphp/test/slow/ext_xdebug/call_function_helper.php.ini
@@ -1 +1 @@
-hhvm.xdebug-not-done.enable = 1
+xdebug.enable = 1
diff --git a/hphp/test/slow/ext_xdebug/call_line.php.ini b/hphp/test/slow/ext_xdebug/call_line.php.ini
@@ -1 +1 @@
-hhvm.xdebug-not-done.enable = 1
+xdebug.enable = 1
diff --git a/hphp/test/slow/ext_xdebug/config.ini b/hphp/test/slow/ext_xdebug/config.ini
@@ -1 +1 @@
-hhvm.xdebug-not-done.enable = 1
+xdebug.enable = 1
diff --git a/hphp/test/slow/ext_xdebug/disable.php.ini b/hphp/test/slow/ext_xdebug/disable.php.ini
@@ -1 +1 @@
-hhvm.xdebug-not-done.enable = 0
+xdebug.enable = 0
diff --git a/hphp/test/slow/ext_xdebug/force_error_reporting.php b/hphp/test/slow/ext_xdebug/force_error_reporting.php
@@ -1,5 +1,5 @@
 <?php
 error_reporting(E_ALL & (~E_USER_NOTICE));
 trigger_error("This shouldn't show up", E_USER_NOTICE);
-ini_set("hhvm.xdebug-not-done.force_error_reporting", E_ALL);
+ini_set("xdebug.force_error_reporting", E_ALL);
 trigger_error("This should show up", E_USER_NOTICE);
diff --git a/hphp/test/slow/ext_xdebug/get_function_stack.php.ini b/hphp/test/slow/ext_xdebug/get_function_stack.php.ini
@@ -1,2 +1,2 @@
-hhvm.xdebug-not-done.enable = 1
-hhvm.xdebug-not-done.collect_params = 1
+xdebug.enable = 1
+xdebug.collect_params = 1
diff --git a/hphp/test/slow/ext_xdebug/halt_level.php b/hphp/test/slow/ext_xdebug/halt_level.php
@@ -2,6 +2,6 @@
 
 trigger_error("Test notice", E_USER_NOTICE);
 trigger_error("Test deprecated", E_USER_DEPRECATED);
-ini_set("hhvm.xdebug-not-done.halt_level", E_ALL);
+ini_set("xdebug.halt_level", E_ALL);
 trigger_error("Test deprecated", E_USER_DEPRECATED);
 trigger_error("Test notice", E_USER_NOTICE);
diff --git a/hphp/test/slow/ext_xdebug/max_nesting_level_0.php b/hphp/test/slow/ext_xdebug/max_nesting_level_0.php
@@ -6,6 +6,6 @@ function foo($i) {
 }
 
 $i = xdebug_get_stack_depth();
-ini_set("hhvm.xdebug-not-done.max_nesting_level", $i + 3);
+ini_set("xdebug.max_nesting_level", $i + 3);
 echo "$i\n";
 foo($i + 1);
diff --git a/hphp/test/slow/ext_xdebug/max_nesting_level_1.php b/hphp/test/slow/ext_xdebug/max_nesting_level_1.php
@@ -5,12 +5,12 @@ function foo($i) {
   if ($i === 10) {
     return;
   } else if ($i === 3) {
-    ini_set("hhvm.xdebug-not-done.max_nesting_level", 0);
+    ini_set("xdebug.max_nesting_level", 0);
   }
   foo($i + 1);
 }
 
 $i = xdebug_get_stack_depth();
 echo "$i\n";
-ini_set("hhvm.xdebug-not-done.max_nesting_level", $i + 4);
+ini_set("xdebug.max_nesting_level", $i + 4);
 foo($i + 1);
diff --git a/hphp/test/slow/ext_xdebug/profiling_basic_1.php.ini b/hphp/test/slow/ext_xdebug/profiling_basic_1.php.ini
@@ -1,2 +1,2 @@
-hhvm.xdebug-not-done.enable = 1
-hhvm.xdebug-not-done.profiler_enable = 1
+xdebug.enable = 1
+xdebug.profiler_enable = 1
diff --git a/hphp/test/slow/ext_xdebug/profiling_basic_2.php.ini b/hphp/test/slow/ext_xdebug/profiling_basic_2.php.ini
@@ -1,4 +1,4 @@
-hhvm.xdebug-not-done.enable = 1
-hhvm.xdebug-not-done.profiler_enable = 1
-hhvm.xdebug-not-done.profiler_output_dir = /tmp
-hhvm.xdebug-not-done.profiler_output_name = cachegrind.out.custom.%r
+xdebug.enable = 1
+xdebug.profiler_enable = 1
+xdebug.profiler_output_dir = /tmp
+xdebug.profiler_output_name = cachegrind.out.custom.%r
diff --git a/hphp/test/slow/ext_xdebug/profiling_testee.inc.ini b/hphp/test/slow/ext_xdebug/profiling_testee.inc.ini
@@ -1,4 +1,4 @@
-hhvm.xdebug-not-done.enable=1
-hhvm.xdebug-not-done.profiler_enable=1
-hhvm.xdebug-not-done.profiler_output_dir=/tmp
-hhvm.xdebug-not-done.profiler_output_name=hhvm-xdebug-cachegrind.%p.out
+xdebug.enable=1
+xdebug.profiler_enable=1
+xdebug.profiler_output_dir=/tmp
+xdebug.profiler_output_name=hhvm-xdebug-cachegrind.%p.out
diff --git a/hphp/test/slow/ext_xdebug/remote/breakpoint_manipulation.php.expectf b/hphp/test/slow/ext_xdebug/remote/breakpoint_manipulation.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/breakpoint_manipulation.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/breakpoint_manipulation.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) step_into -i 0
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" status="break" reason="ok" command="step_into" transaction_id="0"><xdebug:message lineno="7" filename="file://%s/test/slow/ext_xdebug/remote/breakpoint_manipulation.php.test"></xdebug:message></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/breakpoint_set.php.expectf b/hphp/test/slow/ext_xdebug/remote/breakpoint_set.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/breakpoint_set.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/breakpoint_set.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) breakpoint_set -i 0 -t line -f breakpoint_set_helper.inc -n 25
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" command="breakpoint_set" transaction_id="0" id="0" state="enabled"></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/config.ini b/hphp/test/slow/ext_xdebug/remote/config.ini
@@ -1 +1 @@
-hhvm.xdebug-not-done.enable = 1
+xdebug.enable = 1
diff --git a/hphp/test/slow/ext_xdebug/remote/context_names.php.expectf b/hphp/test/slow/ext_xdebug/remote/context_names.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/context_names.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/context_names.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) context_names -i 0
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" command="context_names" transaction_id="0"><context name="Locals" id="0"></context><context name="Superglobals" id="1"></context><context name="User defined constants" id="2"></context></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/detach.php.expectf b/hphp/test/slow/ext_xdebug/remote/detach.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/detach.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/detach.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) step_over -i 0
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" status="break" reason="ok" command="step_over" transaction_id="0"><xdebug:message lineno="2" filename="file://%s/test/slow/ext_xdebug/remote/detach.php.test"></xdebug:message></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/errors.php.expectf b/hphp/test/slow/ext_xdebug/remote/errors.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/errors.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/errors.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) invalid_command
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug"><error code="4"><message><![CDATA[unimplemented command]]></message></error></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/eval.php.expectf b/hphp/test/slow/ext_xdebug/remote/eval.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/eval.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/eval.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) breakpoint_set -i 0 -t line -f eval.php.test -n 45
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" command="breakpoint_set" transaction_id="0" id="0" state="enabled"></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/feature.php.expectf b/hphp/test/slow/ext_xdebug/remote/feature.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/feature.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/feature.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) feature_set -i 0 -n max_children -v 100
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" command="feature_set" transaction_id="0" feature="max_children" success="1"></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/init.php.expectf b/hphp/test/slow/ext_xdebug/remote/init.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/init.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/init.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) run -i 0
 About to throw an exception
 Caught the exception!

diff --git a/hphp/test/slow/ext_xdebug/remote/jit.php.expectf b/hphp/test/slow/ext_xdebug/remote/jit.php.expectf
@@ -1,6 +1,6 @@
 About to throw an exception
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/jit.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/jit.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) run -i 0
 Caught the exception!
 <?xml version="1.0" encoding="iso-8859-1"?>

diff --git a/hphp/test/slow/ext_xdebug/remote/jit.php.test.ini b/hphp/test/slow/ext_xdebug/remote/jit.php.test.ini
@@ -1,4 +1,4 @@
-hhvm.xdebug-not-done.enable = 1
-hhvm.xdebug-not-done.remote_enable = 1
-hhvm.xdebug-not-done.remote_autostart = 1
-hhvm.xdebug-not-done.remote_mode = jit
+xdebug.enable = 1
+xdebug.remote_enable = 1
+xdebug.remote_autostart = 1
+xdebug.remote_mode = jit
diff --git a/hphp/test/slow/ext_xdebug/remote/profiler_name_get.php.expectf b/hphp/test/slow/ext_xdebug/remote/profiler_name_get.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/profiler_name_get.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/profiler_name_get.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) step_over -i 0
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" status="break" reason="ok" command="step_over" transaction_id="0"><xdebug:message lineno="2" filename="file://%s/test/slow/ext_xdebug/remote/profiler_name_get.php.test"></xdebug:message></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/profiler_name_get.php.test.ini b/hphp/test/slow/ext_xdebug/remote/profiler_name_get.php.test.ini
@@ -1,4 +1,4 @@
-hhvm.xdebug-not-done.enable = 1
-hhvm.xdebug-not-done.remote_enable = 1
-hhvm.xdebug-not-done.remote_autostart = 1
-hhvm.xdebug-not-done.profiler_enable = 1
+xdebug.enable = 1
+xdebug.remote_enable = 1
+xdebug.remote_autostart = 1
+xdebug.profiler_enable = 1
diff --git a/hphp/test/slow/ext_xdebug/remote/property_get.php.expectf b/hphp/test/slow/ext_xdebug/remote/property_get.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/property_get.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/property_get.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) step_into -i 0
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" status="break" reason="ok" command="step_into" transaction_id="0"><xdebug:message lineno="10" filename="file://%s/test/slow/ext_xdebug/remote/property_get.php.test"></xdebug:message></response>

diff --git a/hphp/test/slow/ext_xdebug/remote/property_set.php.expectf b/hphp/test/slow/ext_xdebug/remote/property_set.php.expectf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/property_set.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug-not-done]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file://%s/test/slow/ext_xdebug/remote/property_set.php.test" language="PHP" protocol_version="" appid=""><engine version=""><![CDATA[xdebug]]></engine><author><![CDATA[HHVM]]></author><url><![CDATA[http://hhvm.com/]]></url><copyright><![CDATA[Copyright (c) 2002-2013 by Derick Rethans]]></copyright></init>
 (cmd) step_into -i 0
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" status="break" reason="ok" command="step_into" transaction_id="0"><xdebug:message lineno="3" filename="file://%s/test/slow/ext_xdebug/remote/property_set.php.test"></xdebug:message></response>