diff --git a/hphp/test/server/debugger/debugger/test1.in b/hphp/test/server/debugger/debugger/test1.in index e22d1801d..9729c0a41 100644 --- a/hphp/test/server/debugger/debugger/test1.in +++ b/hphp/test/server/debugger/debugger/test1.in @@ -1,5 +1,5 @@ break break1.php:7 -continue +continue variable break clear all break foo() @@ -12,12 +12,6 @@ break cls::pubCls() continue break clear all continue -continue -@ $a = 0 -break test1.php:18 -continue -p $a -break clear all break end test1.php continue break psp test1.php diff --git a/hphp/test/server/debugger/debugger/test1.php b/hphp/test/server/debugger/debugger/test1.php index b884c6715..f7966caa5 100644 --- a/hphp/test/server/debugger/debugger/test1.php +++ b/hphp/test/server/debugger/debugger/test1.php @@ -11,13 +11,5 @@ function test_break() { $obj->pubHardBreak($x); } -function test_sleep() { - $a = 1; - // $a will be set to 0 by debugger after interrupt - while ($a == 1) { sleep(1); } - return $a; -} - test_break(); -test_sleep(); echo "request done\n"; diff --git a/hphp/test/server/debugger/tests/runTest1.php b/hphp/test/server/debugger/tests/runTest1.php index a20cdc06e..63416715a 100644 --- a/hphp/test/server/debugger/tests/runTest1.php +++ b/hphp/test/server/debugger/tests/runTest1.php @@ -9,13 +9,6 @@ function test1Controller($hphpdOutput, $hphpdProcessId, $serverPort) { echo "Requesting test1.php\n"; request($url, 10); // proceed without waiting for a response - // Send ctrl-c to client, which is waiting for a hung server - waitForClientToOutput($hphpdOutput, "Break at cls::pubHardBreak()", $url); - waitForClientToOutput($hphpdOutput, "Waiting for server response"); - sleep(2); // give server a chance to get itself in the enless loop - echo "sending SIGINT to the debugger client.\n"; - posix_kill($hphpdProcessId, SIGINT); - // Let client run until script quits waitForClientToOutput($hphpdOutput, "quit"); } diff --git a/hphp/test/server/debugger/tests/runTest1.php.expectf b/hphp/test/server/debugger/tests/runTest1.php.expectf index 8b456f43e..760b2f0fd 100644 --- a/hphp/test/server/debugger/tests/runTest1.php.expectf +++ b/hphp/test/server/debugger/tests/runTest1.php.expectf @@ -4,7 +4,7 @@ Attaching to debugger's default sandbox and pre-loading, please wait... break break1.php:7 Breakpoint 1 set on line 7 of break1.php But wont break until file break1.php has been loaded. -continue +continue Waiting for server response Requesting test1.php Breakpoint 1 reached at foo() on line 7 of %s/break1.php @@ -57,29 +57,6 @@ Break at cls::pubHardBreak() on line 19 of %s/break1.php 19 hphpd_break(); 20 error_log("pubHardBreak:done"); -continue -Waiting for server response -sending SIGINT to the debugger client. -Pausing program execution, please wait... -Break at test_sleep() on line 17 of %s/test1.php - 16 // $a will be set to 0 by debugger after interrupt - 17 while ($a == 1) { sleep(1); } - 18 return $a; - -@ $a = 0 -break test1.php:18 -Breakpoint 1 set on line 18 of test1.php -continue -Waiting for server response -Breakpoint 1 reached at test_sleep() on line 18 of %s/test1.php - 17 while ($a == 1) { sleep(1); } - 18 return $a; - 19 } - -p $a -0 -break clear all -All breakpoints are cleared. break end test1.php Breakpoint 1 set end of request or start of psp when request is test1.php continue