MFH: Bug #21751: Part one never let this happen again...

diff --git a/run-tests.php b/run-tests.php
index 49c0d8fdbdbf7564a4dac6bc617d9b50ad3f7fda..86e0be393c1c06f1931bd7d072421556560e7e59 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -44,9 +44,14 @@ if (getenv('TEST_PHP_SRCDIR')) {
 
 $cwd = getcwd();
 set_time_limit(0);
-while(ob_get_level()) {
-       ob_end_clean();
-}
+
+// delete as much output buffers as possible
+$ob = ob_get_level();
+if ($ob) do {
+       @ob_end_clean();
+} while($ob>1 && $ob-- > ob_get_level());
+if (ob_get_level()) echo "Not all buffers were deleted.\n";
+
 error_reporting(E_ALL);
 ini_set('magic_quotes_runtime',0); // this would break tests by modifying EXPECT sections