Clean DONE tags from tests

Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.

Closes GH-4872.

73 files changed, 0 insertions, 146 deletions

diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt
index 819fdc2c2b..4ea10e9721 100644
--- a/Zend/tests/019.phpt
+++ b/Zend/tests/019.phpt
@@ -360,7 +360,6 @@ var_dump($global_var);
 //Note: No error conditions relating to passing arguments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
-===DONE===
 --EXPECTF--
 *** Testing unset(), empty() & isset() with scalar variables ***
 -- Iteration 1 --
@@ -1330,4 +1329,3 @@ bool(false)
 bool(false)
 bool(true)
 int(10)
-===DONE===
diff --git a/Zend/tests/bug26166.phpt b/Zend/tests/bug26166.phpt
index 7a3be86c3f..bd16050a87 100644
--- a/Zend/tests/bug26166.phpt
+++ b/Zend/tests/bug26166.phpt
@@ -61,11 +61,9 @@ try {
 }
 
 ?>
-===DONE===
 --EXPECT--
 Hello World!
 ===NONE===
 Method NoneTest::__toString() must return a string value
 ===THROW===
 This is an error!
-===DONE===
diff --git a/Zend/tests/bug26229.phpt b/Zend/tests/bug26229.phpt
index cf23f157f8..393b49f3d0 100644
--- a/Zend/tests/bug26229.phpt
+++ b/Zend/tests/bug26229.phpt
@@ -23,7 +23,5 @@ catch(Exception $e)
 	echo $e->getMessage() . "\n";
 }
 ?>
-===DONE===
 --EXPECT--
 Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator
-===DONE===
diff --git a/Zend/tests/bug26696.phpt b/Zend/tests/bug26696.phpt
index 14083dfb9f..57ba310c1d 100644
--- a/Zend/tests/bug26696.phpt
+++ b/Zend/tests/bug26696.phpt
@@ -16,7 +16,5 @@ for ($i = 0; $i < $len; $i++) {
 }
 
 ?>
-===DONE===
 --EXPECT--
 a-s-d-d-/-?+
-===DONE===
diff --git a/Zend/tests/bug26697.phpt b/Zend/tests/bug26697.phpt
index c0a4850e55..1692e388ef 100644
--- a/Zend/tests/bug26697.phpt
+++ b/Zend/tests/bug26697.phpt
@@ -12,10 +12,8 @@ spl_autoload_register(function ($name) {
 var_dump(class_exists('NotExistingClass'));
 
 ?>
-===DONE===
 --EXPECT--
 {closure}(NotExistingClass)
 bool(false)
 {closure}(NotExistingClass), done
 bool(false)
-===DONE===
diff --git a/Zend/tests/bug26698.phpt b/Zend/tests/bug26698.phpt
index 8fbf551b6b..066fdc3a37 100644
--- a/Zend/tests/bug26698.phpt
+++ b/Zend/tests/bug26698.phpt
@@ -65,9 +65,7 @@ $p->callOne();
 $p->callTwo();
 $p->callThree();
 ?>
-===DONE===
 --EXPECT--
 Caught: NONE
 Caught: NONE
 Caught: NONE
-===DONE===
diff --git a/Zend/tests/bug26802.phpt b/Zend/tests/bug26802.phpt
index 0ab4760d48..11e468d088 100644
--- a/Zend/tests/bug26802.phpt
+++ b/Zend/tests/bug26802.phpt
@@ -30,8 +30,6 @@ foo::$method();
 
 
 ?>
-===DONE===
 --EXPECT--
 global_func
 foo::foo_func
-===DONE===
diff --git a/Zend/tests/bug27304.phpt b/Zend/tests/bug27304.phpt
index 9eb1ececf7..f9ca3e2ecf 100644
--- a/Zend/tests/bug27304.phpt
+++ b/Zend/tests/bug27304.phpt
@@ -16,8 +16,6 @@ Staticexample::test();
 $b->test();
 
 ?>
-===DONE===
 --EXPECT--
 bool(false)
 bool(false)
-===DONE===
diff --git a/Zend/tests/bug27669.phpt b/Zend/tests/bug27669.phpt
index 747593031f..679c7a6105 100644
--- a/Zend/tests/bug27669.phpt
+++ b/Zend/tests/bug27669.phpt
@@ -10,7 +10,5 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dy
 	$y[0] = 'hello';
 	A::{$y[0]}();
 ?>
-===DONE===
 --EXPECTF--
 Hello World
-===DONE===
diff --git a/Zend/tests/bug27798.phpt b/Zend/tests/bug27798.phpt
index 2545d9e100..9c84731fe6 100644
--- a/Zend/tests/bug27798.phpt
+++ b/Zend/tests/bug27798.phpt
@@ -32,7 +32,6 @@ var_dump(get_object_vars(new Base));
 var_dump(get_object_vars(new Child));
 
 ?>
-===DONE===
 --EXPECT--
 Base::__construct
 array(3) {
@@ -69,4 +68,3 @@ array(1) {
   ["Foo"]=>
   int(1)
 }
-===DONE===
diff --git a/Zend/tests/bug28442.phpt b/Zend/tests/bug28442.phpt
index 36a6fc6ab9..fd57fef854 100644
--- a/Zend/tests/bug28442.phpt
+++ b/Zend/tests/bug28442.phpt
@@ -44,7 +44,6 @@ var_dump(ClassB::$prop);
 var_dump(ClassC::$prop);
 
 ?>
-===DONE===
 --EXPECT--
 ===INIT===
 string(1) "A"
@@ -62,4 +61,3 @@ string(2) "B2"
 string(2) "A2"
 string(2) "C2"
 string(2) "C2"
-===DONE===
diff --git a/Zend/tests/bug28444.phpt b/Zend/tests/bug28444.phpt
index 464aaef4c7..245a1f2704 100644
--- a/Zend/tests/bug28444.phpt
+++ b/Zend/tests/bug28444.phpt
@@ -52,7 +52,6 @@ var_dump($t->x = 5);
 var_dump($y->z->x = 6);
 
 ?>
-===DONE===
 --EXPECT--
 object(ObjectOne)#2 (1) {
   ["x"]=>
@@ -75,4 +74,3 @@ Overloaded::__get(z)
 int(5)
 Overloaded::__get(z)
 int(6)
-===DONE===
diff --git a/Zend/tests/bug29368.phpt b/Zend/tests/bug29368.phpt
index 1987fa9b45..20dc59a644 100644
--- a/Zend/tests/bug29368.phpt
+++ b/Zend/tests/bug29368.phpt
@@ -27,8 +27,6 @@ try
 unset($bar);
 
 ?>
-===DONE===
 --EXPECT--
 Foo::__construct
 Caught exception!
-===DONE===
diff --git a/Zend/tests/bug29505.phpt b/Zend/tests/bug29505.phpt
index 4d7c053516..a52ea66929 100644
--- a/Zend/tests/bug29505.phpt
+++ b/Zend/tests/bug29505.phpt
@@ -11,7 +11,6 @@ class Test {
 var_dump(get_class_vars('Test'));
 
 ?>
-===DONE===
 --EXPECT--
 array(2) {
   ["empty"]=>
@@ -28,4 +27,3 @@ array(2) {
     }
   }
 }
-===DONE===
diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt
index cd0ca4872e..4b2739ab2e 100644
--- a/Zend/tests/bug30162.phpt
+++ b/Zend/tests/bug30162.phpt
@@ -41,7 +41,6 @@ $db = new hariCow;
 
 var_dump($db);
 ?>
-===DONE===
 --EXPECTF--
 Warning: Undefined variable: db in %s on line %d
 NULL
@@ -51,4 +50,3 @@ object(hariCow)#%d (2) {
   ["y"]=>
   string(1) "y"
 }
-===DONE===
diff --git a/Zend/tests/bug30346.phpt b/Zend/tests/bug30346.phpt
index 8db080f820..3a4caa6f7a 100644
--- a/Zend/tests/bug30346.phpt
+++ b/Zend/tests/bug30346.phpt
@@ -18,7 +18,5 @@ echo $post[$id.'_show'];
 echo "\n";
 
 ?>
-===DONE===
 --EXPECT--
 page_show
-===DONE===
diff --git a/Zend/tests/bug30407.phpt b/Zend/tests/bug30407.phpt
index 6dcc6b3481..ad1993897d 100644
--- a/Zend/tests/bug30407.phpt
+++ b/Zend/tests/bug30407.phpt
@@ -11,8 +11,6 @@ function haricow($a = 'one') {
 haricow();
 haricow();
 ?>
-===DONE===
 --EXPECT--
 string(3) "one"
 string(3) "one"
-===DONE===
diff --git a/Zend/tests/bug30725.phpt b/Zend/tests/bug30725.phpt
index 75cb04843c..bbcf09dfdd 100644
--- a/Zend/tests/bug30725.phpt
+++ b/Zend/tests/bug30725.phpt
@@ -26,7 +26,5 @@ catch(Exception $e)
 }
 
 ?>
-===DONE===
 --EXPECT--
 Caught
-===DONE===
diff --git a/Zend/tests/bug30998.phpt b/Zend/tests/bug30998.phpt
index 2ff3068e5c..310c08d75f 100644
--- a/Zend/tests/bug30998.phpt
+++ b/Zend/tests/bug30998.phpt
@@ -13,9 +13,7 @@ set_error_handler('my_error');
 
 $f = fopen("/tmp/blah", "r");
 ?>
-===DONE===
 --EXPECTF--
 fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d
 
 Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d
-===DONE===
diff --git a/Zend/tests/bug31102.phpt b/Zend/tests/bug31102.phpt
index 624eee52ba..c01c2e004a 100644
--- a/Zend/tests/bug31102.phpt
+++ b/Zend/tests/bug31102.phpt
@@ -36,7 +36,6 @@ while($test++ < 5)
 }
 ?>
 ===DONE===
-<?php exit(0); ?>
 --EXPECTF--
 {closure}(Test1,1)
 Caught: Test1::__construct
diff --git a/Zend/tests/bug31720.phpt b/Zend/tests/bug31720.phpt
index b5e935cd80..1e01d41772 100644
--- a/Zend/tests/bug31720.phpt
+++ b/Zend/tests/bug31720.phpt
@@ -10,8 +10,6 @@ try {
     echo $e->getMessage(), "\n";
 }
 ?>
-===DONE===
 --EXPECTF--
 Warning: Undefined variable: nonesuchvar in %s on line %d
 array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object
-===DONE===
diff --git a/Zend/tests/bug32226.phpt b/Zend/tests/bug32226.phpt
index f8e13cfb6e..d3432c4247 100644
--- a/Zend/tests/bug32226.phpt
+++ b/Zend/tests/bug32226.phpt
@@ -30,7 +30,5 @@ catch(Exception $e)
 }
 
 ?>
-===DONE===
 --EXPECT--
 Caught
-===DONE===
diff --git a/Zend/tests/bug32252.phpt b/Zend/tests/bug32252.phpt
index 706da18cfb..ce97384c0e 100644
--- a/Zend/tests/bug32252.phpt
+++ b/Zend/tests/bug32252.phpt
@@ -40,8 +40,6 @@ catch (Exception $e)
 }
 
 ?>
-===DONE===
 --EXPECT--
 Test::offsetSet(-1, 123)
 CAUGHT
-===DONE===
diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt
index e73bca12ac..a58bcf4ce3 100644
--- a/Zend/tests/bug32290.phpt
+++ b/Zend/tests/bug32290.phpt
@@ -94,8 +94,6 @@ echo "\n===E===\n";
 var_dump($x->doSomethingStatic(1));
 
 ?>
-===DONE===
-<?php exit(0); ?>
 --EXPECT--
 ===A===
 TestB::doSomething(1)
@@ -121,4 +119,3 @@ int(1)
 TestB::doSomethingStatic(1)
 TestA::doSomethingStatic(2)
 int(1)
-===DONE===
diff --git a/Zend/tests/bug37212.phpt b/Zend/tests/bug37212.phpt
index 212ef23ec7..0d19efa8f1 100644
--- a/Zend/tests/bug37212.phpt
+++ b/Zend/tests/bug37212.phpt
@@ -38,7 +38,6 @@ $B->copyValue($C);
 var_dump($B);
 
 ?>
-===DONE===
 --EXPECTF--
 object(B)#%d (1) {
   ["value":protected]=>
@@ -52,4 +51,3 @@ object(B)#%d (1) {
   ["value":protected]=>
   string(1) "C"
 }
-===DONE===
diff --git a/Zend/tests/bug37667.phpt b/Zend/tests/bug37667.phpt
index ecf43c5b80..83a87a9688 100644
--- a/Zend/tests/bug37667.phpt
+++ b/Zend/tests/bug37667.phpt
@@ -26,7 +26,6 @@ $obj->property[] = 2;
 var_dump($obj);
 
 ?>
-===DONE===
 --EXPECTF--
 string(3) "bar"
 
@@ -50,4 +49,3 @@ object(Test)#%d (1) {
     string(3) "bar"
   }
 }
-===DONE===
diff --git a/Zend/tests/bug46196.phpt b/Zend/tests/bug46196.phpt
index 7a6a753d87..9b2ca618ee 100644
--- a/Zend/tests/bug46196.phpt
+++ b/Zend/tests/bug46196.phpt
@@ -22,10 +22,8 @@ function myErrorHandler($errno, $errstr, $errfile, $errline)
 }
 
 ?>
-===DONE===
 --EXPECT--
 *** Testing restore_error_handler() : error bug #46196 ***
 NULL
 bool(true)
 NULL
-===DONE===
diff --git a/Zend/tests/bug48215.phpt b/Zend/tests/bug48215.phpt
index 4582057d98..6af1867361 100644
--- a/Zend/tests/bug48215.phpt
+++ b/Zend/tests/bug48215.phpt
@@ -27,10 +27,8 @@ class B extends A
 $b = new B();
 $b->A();
 ?>
-===DONE===
 --EXPECT--
 B::__construct
 A::__construct
 B::A
 A::A
-===DONE===
diff --git a/Zend/tests/bug66015.phpt b/Zend/tests/bug66015.phpt
index 5e0815240d..1222ab3a96 100644
--- a/Zend/tests/bug66015.phpt
+++ b/Zend/tests/bug66015.phpt
@@ -24,7 +24,6 @@ class Test
 $test = new Test();
 ?>
 
-===DONE===
 --EXPECT--
 array (
   1 => 'first',
@@ -32,4 +31,3 @@ array (
   3 => 'third',
   4 => 4,
 )
-===DONE===
diff --git a/Zend/tests/bug68797.phpt b/Zend/tests/bug68797.phpt
index db0306049f..0202a63125 100644
--- a/Zend/tests/bug68797.phpt
+++ b/Zend/tests/bug68797.phpt
@@ -7,7 +7,5 @@ precision=17
 
 echo 2.2250738585072012e-308, "\n";
 ?>
-==DONE==
 --EXPECT--
 2.2250738585072014E-308
-==DONE==
diff --git a/Zend/tests/bug71572.phpt b/Zend/tests/bug71572.phpt
index f4f44449cd..063a98fcb9 100644
--- a/Zend/tests/bug71572.phpt
+++ b/Zend/tests/bug71572.phpt
@@ -10,7 +10,6 @@ var_dump($str[3] = "");
 var_dump($str[10] = "");
 var_dump($str);
 ?>
-==DONE==
 --EXPECTF--
 Warning: Cannot assign an empty string to a string offset in %s on line %d
 NULL
@@ -24,4 +23,3 @@ NULL
 Warning: Cannot assign an empty string to a string offset in %s on line %d
 NULL
 string(3) "abc"
-==DONE==
diff --git a/Zend/tests/bug72918.phpt b/Zend/tests/bug72918.phpt
index 403d4e69c5..92ee518de5 100644
--- a/Zend/tests/bug72918.phpt
+++ b/Zend/tests/bug72918.phpt
@@ -13,10 +13,8 @@ $string[-3]
 
 EOT;
 ?>
-===DONE===
 --EXPECT--
 foo
 c
 foo
 c
-===DONE===
diff --git a/Zend/tests/bug76965.phpt b/Zend/tests/bug76965.phpt
index 1a8e7d2d35..ce157733a5 100644
--- a/Zend/tests/bug76965.phpt
+++ b/Zend/tests/bug76965.phpt
@@ -15,7 +15,6 @@ END;
 
 var_dump(parse_ini_string($ini, false, INI_SCANNER_RAW));
 ?>
-===DONE===
 --EXPECT--
 array(7) {
   [1]=>
@@ -33,4 +32,3 @@ array(7) {
   [7]=>
   string(7) "foo"bar"
 }
-===DONE===
diff --git a/Zend/tests/bug77291.phpt b/Zend/tests/bug77291.phpt
index 2960648a7c..e5977eba08 100644
--- a/Zend/tests/bug77291.phpt
+++ b/Zend/tests/bug77291.phpt
@@ -35,8 +35,6 @@ var_dump(isset($foo->a));
 $foo = new Foo45;
 var_dump($foo->a);
 ?>
-===DONE===
 --EXPECT--
 bool(true)
 string(10) "Some value"
-===DONE===
diff --git a/Zend/tests/bug_debug_backtrace.phpt b/Zend/tests/bug_debug_backtrace.phpt
index 71ce129201..95530e01e4 100644
--- a/Zend/tests/bug_debug_backtrace.phpt
+++ b/Zend/tests/bug_debug_backtrace.phpt
@@ -18,11 +18,9 @@ eval("foo();");
 
 echo "Done\n";
 ?>
-===DONE===
 --EXPECTF--
 #0  boo() called at [%s:%d]
 #1  bar() called at [%s:%d]
 #2  foo() called at [%s(%d) : eval()'d code:1]
 #3  eval() called at [%s:%d]
 Done
-===DONE===
diff --git a/Zend/tests/closure_034.phpt b/Zend/tests/closure_034.phpt
index 8ba276a68a..27981a5c74 100644
--- a/Zend/tests/closure_034.phpt
+++ b/Zend/tests/closure_034.phpt
@@ -7,7 +7,6 @@ $a = function () use(&$a) {};
 var_dump($a);
 
 ?>
-===DONE===
 --EXPECTF--
 object(Closure)#%d (1) {
   ["static"]=>
@@ -16,4 +15,3 @@ object(Closure)#%d (1) {
     *RECURSION*
   }
 }
-===DONE===
diff --git a/Zend/tests/closures/closure_from_callable_basic.phpt b/Zend/tests/closures/closure_from_callable_basic.phpt
index 0aacaf2ff5..d4c6427ae8 100644
--- a/Zend/tests/closures/closure_from_callable_basic.phpt
+++ b/Zend/tests/closures/closure_from_callable_basic.phpt
@@ -96,7 +96,6 @@ echo $fn(" OK".PHP_EOL);
 
 
 ?>
-===DONE===
 --EXPECT--
 Access public static function OK
 Access public static function with different case OK
@@ -118,4 +117,3 @@ Access public instance method of parent object through "self::" to parent method
 Access proteced instance method of parent object through "self::" to parent method OK
 MagicCall __call instance method __call,nonExistentMethod, OK
 MagicCall __callStatic static method __callStatic,nonExistentMethod, OK
-===DONE===
diff --git a/Zend/tests/closures/closure_from_callable_error.phpt b/Zend/tests/closures/closure_from_callable_error.phpt
index c6e4a7e0bb..5ada0ef2bf 100644
--- a/Zend/tests/closures/closure_from_callable_error.phpt
+++ b/Zend/tests/closures/closure_from_callable_error.phpt
@@ -193,7 +193,6 @@ catch (\Throwable $t) {
 echo "OK\n";
 
 ?>
-===DONE===
 --EXPECT--
 Cannot access privateInstance method statically
 Cannot access privateInstance method statically with colon scheme
@@ -211,4 +210,3 @@ Function scope cannot closure over protected instance method
 Function scope cannot closure over private instance method
 Access private instance method of parent object through "self::" to parent method
 OK
-===DONE===
diff --git a/Zend/tests/function_exists_basic.phpt b/Zend/tests/function_exists_basic.phpt
index 5832231551..5125350d8d 100644
--- a/Zend/tests/function_exists_basic.phpt
+++ b/Zend/tests/function_exists_basic.phpt
@@ -28,7 +28,6 @@ Class C {
 }
 var_dump(function_exists('C::f'));
 ?>
-===Done===
 --EXPECT--
 *** Testing function_exists() : basic functionality ***
 Internal function: bool(true)
@@ -36,4 +35,3 @@ User defined function: bool(true)
 Case sensitivity: bool(true)
 Non existent function: bool(false)
 Method: bool(false)
-===Done===
diff --git a/Zend/tests/get_defined_functions_basic.phpt b/Zend/tests/get_defined_functions_basic.phpt
index f782b90892..1ea5df7ec7 100644
--- a/Zend/tests/get_defined_functions_basic.phpt
+++ b/Zend/tests/get_defined_functions_basic.phpt
@@ -52,8 +52,6 @@ if (count($user) == 2 && in_array("foo", $user) && in_array("helloworld", $user)
 }
 
 ?>
-===Done===
 --EXPECT--
 *** Testing get_defined_functions() : basic functionality ***
 TEST PASSED
-===Done===
diff --git a/Zend/tests/halt_compiler2.phpt b/Zend/tests/halt_compiler2.phpt
index a89274a804..09af8b2a03 100644
--- a/Zend/tests/halt_compiler2.phpt
+++ b/Zend/tests/halt_compiler2.phpt
@@ -11,7 +11,6 @@ file_put_contents(__DIR__ . '/test2.php', $text);
 include __DIR__ . '/test1.php';
 include __DIR__ . '/test2.php';
 ?>
-==DONE==
 --CLEAN--
 <?php
 unlink(__DIR__ . '/test1.php');
@@ -20,4 +19,3 @@ unlink(__DIR__ . '/test2.php');
 --EXPECT--
 testint(73)
 test2int(74)
-==DONE==
diff --git a/Zend/tests/halt_compiler3.phpt b/Zend/tests/halt_compiler3.phpt
index 7bd7410c73..f0a5323e66 100644
--- a/Zend/tests/halt_compiler3.phpt
+++ b/Zend/tests/halt_compiler3.phpt
@@ -4,7 +4,5 @@ __HALT_COMPILER(); bad define() of __COMPILER_HALT_OFFSET__ 1
 <?php
 define ('__COMPILER_HALT_OFFSET__', 1);
 ?>
-==DONE==
 --EXPECTF--
 Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
-==DONE==
diff --git a/Zend/tests/lsb_001.phpt b/Zend/tests/lsb_001.phpt
index 075109259a..ca2739d102 100644
--- a/Zend/tests/lsb_001.phpt
+++ b/Zend/tests/lsb_001.phpt
@@ -47,7 +47,6 @@ echo ChildClass2::testStaticVar() . "\n";
 echo ChildClass2::testClassConst() . "\n";
 echo ChildClass2::testStaticFunction() . "\n";
 ?>
-==DONE==
 --EXPECT--
 TestClassStatic
 TestClassConst
@@ -58,4 +57,3 @@ ChildClassFunction
 TestClassStatic
 TestClassConst
 TestClassFunction
-==DONE==
diff --git a/Zend/tests/lsb_002.phpt b/Zend/tests/lsb_002.phpt
index 1f433c3038..53eacc90ab 100644
--- a/Zend/tests/lsb_002.phpt
+++ b/Zend/tests/lsb_002.phpt
@@ -52,7 +52,6 @@ echo $childClass2->testStaticVar() . "\n";
 echo $childClass2->testClassConst() . "\n";
 echo $childClass2->testStaticFunction() . "\n";
 ?>
-==DONE==
 --EXPECT--
 TestClassStatic
 TestClassConst
@@ -63,4 +62,3 @@ ChildClassFunction
 TestClassStatic
 TestClassConst
 TestClassFunction
-==DONE==
diff --git a/Zend/tests/lsb_003.phpt b/Zend/tests/lsb_003.phpt
index a7a787e568..aa10071b5f 100644
--- a/Zend/tests/lsb_003.phpt
+++ b/Zend/tests/lsb_003.phpt
@@ -17,8 +17,6 @@ $childClass = ChildClass::createInstance();
 echo get_class($testClass) . "\n";
 echo get_class($childClass) . "\n";
 ?>
-==DONE==
 --EXPECT--
 TestClass
 ChildClass
-==DONE==
diff --git a/Zend/tests/lsb_004.phpt b/Zend/tests/lsb_004.phpt
index 9583ef2547..3f26e339c3 100644
--- a/Zend/tests/lsb_004.phpt
+++ b/Zend/tests/lsb_004.phpt
@@ -14,8 +14,6 @@ class ChildClass extends TestClass {}
 echo TestClass::getClassName() . "\n";
 echo ChildClass::getClassName() . "\n";
 ?>
-==DONE==
 --EXPECT--
 TestClass
 ChildClass
-==DONE==
diff --git a/Zend/tests/lsb_005.phpt b/Zend/tests/lsb_005.phpt
index a01ccd7ca9..b21d049549 100644
--- a/Zend/tests/lsb_005.phpt
+++ b/Zend/tests/lsb_005.phpt
@@ -35,7 +35,6 @@ class TestBB extends TestB {
 TestA::test();
 
 ?>
-==DONE==
 --EXPECT--
 TestA
 TestB
@@ -48,4 +47,3 @@ TestBB
 TestC
 TestBB
 TestA
-==DONE==
diff --git a/Zend/tests/lsb_015.phpt b/Zend/tests/lsb_015.phpt
index 5c40c13160..10df17686b 100644
--- a/Zend/tests/lsb_015.phpt
+++ b/Zend/tests/lsb_015.phpt
@@ -67,7 +67,6 @@ A::myCatch();
 echo "via B:\n";
 B::myCatch();
 ?>
-==DONE==
 --EXPECT--
 via A:
 A
@@ -89,4 +88,3 @@ B
 B
 B
 B
-==DONE==
diff --git a/Zend/tests/lsb_016.phpt b/Zend/tests/lsb_016.phpt
index 4c5fa3248e..b585a9fb6c 100644
--- a/Zend/tests/lsb_016.phpt
+++ b/Zend/tests/lsb_016.phpt
@@ -33,9 +33,7 @@ $o->test();
 $o->a = "b";
 echo $o->a;
 ?>
-==DONE==
 --EXPECT--
 TestChild
 TestChild
 TestChild
-==DONE==
diff --git a/Zend/tests/lsb_017.phpt b/Zend/tests/lsb_017.phpt
index 5f5ca4351f..7f9e77b5f3 100644
--- a/Zend/tests/lsb_017.phpt
+++ b/Zend/tests/lsb_017.phpt
@@ -20,10 +20,8 @@ class D extends A {
 
 echo A::test(B::test(C::test(D::test())))."\n";
 ?>
-==DONE==
 --EXPECT--
 D
 C
 B
 A
-==DONE==
diff --git a/Zend/tests/lsb_018.phpt b/Zend/tests/lsb_018.phpt
index c7877cddf7..9511426d48 100644
--- a/Zend/tests/lsb_018.phpt
+++ b/Zend/tests/lsb_018.phpt
@@ -54,7 +54,6 @@ $x->identify();
 $y->identify();
 $z->identify();
 ?>
-===DONE===
 --EXPECTF--
 object(Foo)#%d (1) {
   ["instanceId":"Singleton":private]=>
@@ -92,4 +91,3 @@ object(Baz)#%d (1) {
   ["instanceId":"Singleton":private]=>
   int(2)
 }
-===DONE===
diff --git a/Zend/tests/multibyte/bug68665.phpt b/Zend/tests/multibyte/bug68665.phpt
index 6846776570..e2c5a860f5 100644
--- a/Zend/tests/multibyte/bug68665.phpt
+++ b/Zend/tests/multibyte/bug68665.phpt
@@ -17,7 +17,5 @@ internal_encoding=big5
 echo '\'hello';
 ?>
 
-===DONE===
 --EXPECT--
 'hello
-===DONE===
diff --git a/Zend/tests/multibyte/multibyte_encoding_001.phpt b/Zend/tests/multibyte/multibyte_encoding_001.phpt
index 1a094814ec..9f3a748e78 100644
--- a/Zend/tests/multibyte/multibyte_encoding_001.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_001.phpt
@@ -18,7 +18,5 @@ declare(encoding='Shift_JIS');
 $s = "•\"; // 0x95+0x5c in script, not somewhere else "
 printf("%x:%x\n", ord($s[0]), ord($s[1]));
 ?>
-===DONE===
 --EXPECT--
 95:5c
-===DONE===
diff --git a/Zend/tests/multibyte/multibyte_encoding_002.phpt b/Zend/tests/multibyte/multibyte_encoding_002.phpt
index 58ea015a6f..c4c225c8f7 100644
--- a/Zend/tests/multibyte/multibyte_encoding_002.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_002.phpt
@@ -16,7 +16,5 @@ internal_encoding=iso-8859-1
 <?php
 print "Hello World\n";
 ?>
-===DONE===
 --EXPECT--
 Hello World
-===DONE===
diff --git a/Zend/tests/ns_069.phpt b/Zend/tests/ns_069.phpt
index cbfb927049..19b6fe8c2b 100644
--- a/Zend/tests/ns_069.phpt
+++ b/Zend/tests/ns_069.phpt
@@ -16,9 +16,7 @@ class Test {
 Test::f();
 
 ?>
-===DONE===
 --EXPECT--
 string(3) "foo"
 string(0) ""
 string(3) "foo"
-===DONE===
diff --git a/Zend/tests/objects_015.phpt b/Zend/tests/objects_015.phpt
index 714d27ad5b..e0f5e9a93d 100644
--- a/Zend/tests/objects_015.phpt
+++ b/Zend/tests/objects_015.phpt
@@ -14,7 +14,6 @@ var_dump($o != null);
 var_dump(is_null($o));
 
 ?>
-===DONE===
 --EXPECT--
 bool(false)
 bool(true)
@@ -23,4 +22,3 @@ bool(true)
 bool(false)
 bool(true)
 bool(false)
-===DONE===
diff --git a/Zend/tests/objects_032.phpt b/Zend/tests/objects_032.phpt
index 52a5e9fed9..b4312ac3f8 100644
--- a/Zend/tests/objects_032.phpt
+++ b/Zend/tests/objects_032.phpt
@@ -25,7 +25,6 @@ $a['foo']['bar'] = 2;
 var_dump($a);
 
 ?>
-==DONE==
 --EXPECT--
 object(A)#1 (1) {
   ["foo"]=>
@@ -37,4 +36,3 @@ object(A)#1 (1) {
     }
   }
 }
-==DONE==
diff --git a/Zend/tests/runtime_compile_time_binary_operands.phpt b/Zend/tests/runtime_compile_time_binary_operands.phpt
index afced7af0c..2908bc3db1 100644
--- a/Zend/tests/runtime_compile_time_binary_operands.phpt
+++ b/Zend/tests/runtime_compile_time_binary_operands.phpt
@@ -148,7 +148,6 @@ if($c === 0) {
 	echo "Failed: $f\n";
 }
 ?>
-===DONE===
 --CLEAN--
 <?php
 $fl = __DIR__ . DIRECTORY_SEPARATOR . 'compare_binary_operands_temp.php';
@@ -156,4 +155,3 @@ $fl = __DIR__ . DIRECTORY_SEPARATOR . 'compare_binary_operands_temp.php';
 ?>
 --EXPECT--
 Failed: 0
-===DONE===
diff --git a/Zend/tests/try/bug70228_7.phpt b/Zend/tests/try/bug70228_7.phpt
index 4b8a80351c..531708f86a 100644
--- a/Zend/tests/try/bug70228_7.phpt
+++ b/Zend/tests/try/bug70228_7.phpt
@@ -21,9 +21,7 @@ function foo() {
 
 foo();
 ?>
-===DONE===
 --EXPECT--
 int(1)
 int(2)
 int(3)
-===DONE===
diff --git a/Zend/tests/try/bug70228_8.phpt b/Zend/tests/try/bug70228_8.phpt
index ad13113c71..93fc09f6a8 100644
--- a/Zend/tests/try/bug70228_8.phpt
+++ b/Zend/tests/try/bug70228_8.phpt
@@ -22,9 +22,7 @@ function foo() {
 
 foo();
 ?>
-===DONE===
 --EXPECT--
 int(1)
 int(2)
 int(3)
-===DONE===
diff --git a/Zend/tests/try/catch_002.phpt b/Zend/tests/try/catch_002.phpt
index 11d736abe2..11dbccf7df 100644
--- a/Zend/tests/try/catch_002.phpt
+++ b/Zend/tests/try/catch_002.phpt
@@ -27,7 +27,5 @@ catch(Exception $e)
 }
 
 ?>
-===DONE===
 --EXPECT--
 Caught
-===DONE===
diff --git a/Zend/tests/try/catch_003.phpt b/Zend/tests/try/catch_003.phpt
index 414d50f815..579011f867 100644
--- a/Zend/tests/try/catch_003.phpt
+++ b/Zend/tests/try/catch_003.phpt
@@ -32,7 +32,5 @@ catch(Exception $e)
 }
 
 ?>
-===DONE===
 --EXPECT--
 Caught
-===DONE===
diff --git a/Zend/tests/try/catch_004.phpt b/Zend/tests/try/catch_004.phpt
index 7c269cc336..5ec82998f7 100644
--- a/Zend/tests/try/catch_004.phpt
+++ b/Zend/tests/try/catch_004.phpt
@@ -37,7 +37,5 @@ class MyObject
 MyObject::test();
 
 ?>
-===DONE===
 --EXPECT--
 Caught
-===DONE===
diff --git a/Zend/tests/try/try_finally_013.phpt b/Zend/tests/try/try_finally_013.phpt
index a37df5147d..0e82dcbb4c 100644
--- a/Zend/tests/try/try_finally_013.phpt
+++ b/Zend/tests/try/try_finally_013.phpt
@@ -18,8 +18,6 @@ function foo() {
 
 foo();
 ?>
-===DONE===
 --EXPECT--
 try
 finally
-===DONE===
diff --git a/Zend/tests/try/try_finally_014.phpt b/Zend/tests/try/try_finally_014.phpt
index 284892a8b5..a45f63f1f3 100644
--- a/Zend/tests/try/try_finally_014.phpt
+++ b/Zend/tests/try/try_finally_014.phpt
@@ -20,8 +20,6 @@ function foo() {
 
 foo();
 ?>
-===DONE===
 --EXPECT--
 try
 finally
-===DONE===
diff --git a/Zend/tests/try/try_finally_015.phpt b/Zend/tests/try/try_finally_015.phpt
index d2580a2e33..f706b9c942 100644
--- a/Zend/tests/try/try_finally_015.phpt
+++ b/Zend/tests/try/try_finally_015.phpt
@@ -21,9 +21,7 @@ function foo() {
 
 foo();
 ?>
-===DONE===
 --EXPECT--
 int(1)
 int(2)
 int(3)
-===DONE===
diff --git a/Zend/tests/try/try_finally_016.phpt b/Zend/tests/try/try_finally_016.phpt
index dc91b42b50..f78a2914af 100644
--- a/Zend/tests/try/try_finally_016.phpt
+++ b/Zend/tests/try/try_finally_016.phpt
@@ -32,8 +32,6 @@ try {
     echo "outer catch\n";
 }
 ?>
-===DONE===
 --EXPECT--
 finally
 outer catch
-===DONE===
diff --git a/Zend/tests/try/try_finally_017.phpt b/Zend/tests/try/try_finally_017.phpt
index 5ba58afdea..b23840c611 100644
--- a/Zend/tests/try/try_finally_017.phpt
+++ b/Zend/tests/try/try_finally_017.phpt
@@ -34,9 +34,7 @@ function foo() {
 
 foo();
 ?>
-===DONE===
 --EXPECT--
 finally1
 catch2
 finally2
-===DONE===
diff --git a/Zend/tests/type_declarations/variance/class_order_autoload1.phpt b/Zend/tests/type_declarations/variance/class_order_autoload1.phpt
index d68d2e8afa..d5ecfa7200 100644
--- a/Zend/tests/type_declarations/variance/class_order_autoload1.phpt
+++ b/Zend/tests/type_declarations/variance/class_order_autoload1.phpt
@@ -24,7 +24,6 @@ spl_autoload_register(function($class) {
 var_dump(new C);
 
 ?>
-===DONE===
 --EXPECT--
 object(A)#2 (0) {
 }
@@ -34,4 +33,3 @@ object(C)#2 (0) {
 }
 object(C)#2 (0) {
 }
-===DONE===
diff --git a/Zend/tests/type_declarations/variance/class_order_autoload2.phpt b/Zend/tests/type_declarations/variance/class_order_autoload2.phpt
index f6229d3995..36414f5fe6 100644
--- a/Zend/tests/type_declarations/variance/class_order_autoload2.phpt
+++ b/Zend/tests/type_declarations/variance/class_order_autoload2.phpt
@@ -25,7 +25,6 @@ spl_autoload_register(function($class) {
 var_dump(new B);
 
 ?>
-===DONE===
 --EXPECT--
 object(A)#2 (0) {
 }
@@ -35,4 +34,3 @@ object(B)#2 (0) {
 }
 object(B)#2 (0) {
 }
-===DONE===
diff --git a/Zend/tests/type_declarations/variance/class_order_autoload3.phpt b/Zend/tests/type_declarations/variance/class_order_autoload3.phpt
index d09f2a9c45..0f34aa224e 100644
--- a/Zend/tests/type_declarations/variance/class_order_autoload3.phpt
+++ b/Zend/tests/type_declarations/variance/class_order_autoload3.phpt
@@ -30,7 +30,6 @@ spl_autoload_register(function($class) {
 var_dump(new B);
 
 ?>
-===DONE===
 --EXPECT--
 object(A)#2 (0) {
 }
@@ -42,4 +41,3 @@ object(B)#2 (0) {
 }
 object(B)#2 (0) {
 }
-===DONE===
diff --git a/Zend/tests/type_declarations/variance/class_order_autoload4.phpt b/Zend/tests/type_declarations/variance/class_order_autoload4.phpt
index 37070b444c..f426f8b44d 100644
--- a/Zend/tests/type_declarations/variance/class_order_autoload4.phpt
+++ b/Zend/tests/type_declarations/variance/class_order_autoload4.phpt
@@ -31,7 +31,6 @@ spl_autoload_register(function($class) {
 var_dump(new B);
 
 ?>
-===DONE===
 --EXPECT--
 object(A)#2 (0) {
 }
@@ -41,4 +40,3 @@ object(B)#2 (0) {
 }
 object(B)#2 (0) {
 }
-===DONE===
diff --git a/Zend/tests/type_declarations/variance/class_order_autoload5.phpt b/Zend/tests/type_declarations/variance/class_order_autoload5.phpt
index 77e9a0a9ec..dcb97852aa 100644
--- a/Zend/tests/type_declarations/variance/class_order_autoload5.phpt
+++ b/Zend/tests/type_declarations/variance/class_order_autoload5.phpt
@@ -41,7 +41,6 @@ spl_autoload_register(function($class) {
 var_dump(new B);
 
 ?>
-===DONE===
 --EXPECT--
 object(A)#2 (0) {
 }
@@ -57,4 +56,3 @@ object(B)#2 (0) {
 }
 object(B)#2 (0) {
 }
-===DONE===