helly Sat Nov 23 12:50:37 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4 run-tests.php
Log:
MFH
#This includes the " to ' change but not the added settings which 4.3
#doesn't have.
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.119.2.9 php4/run-tests.php:1.119.2.10
--- php4/run-tests.php:1.119.2.9 Thu Nov 21 11:50:55 2002
+++ php4/run-tests.php Sat Nov 23 12:50:37 2002
@@ -123,10 +123,10 @@
'html_errors=0',
'track_errors=1',
'report_memleaks=1',
- "docref_root=/phpmanual/",
- "docref_ext=.html",
- "error_prepend_string=",
- "error_append_string=",
+ 'docref_root=/phpmanual/',
+ 'docref_ext=.html',
+ 'error_prepend_string=',
+ 'error_append_string=',
'auto_prepend_file=',
'auto_append_file=',
'magic_quotes_runtime=0',
@@ -235,12 +235,12 @@
function test_sort($a, $b) {
global $cwd;
- $ta = strpos($a, "{$cwd}/tests/run-test")===0 ? 1 : 0;
- $tb = strpos($b, "{$cwd}/tests/run-test")===0 ? 1 : 0;
+ $ta = strpos($a, "{$cwd}/tests")===0 ? 1 + (strpos($a,
+"{$cwd}/tests/run-test")===0 ? 1 : 0) : 0;
+ $tb = strpos($b, "{$cwd}/tests")===0 ? 1 + (strpos($b,
+"{$cwd}/tests/run-test")===0 ? 1 : 0) : 0;
if ($ta == $tb) {
return strcmp($a, $b);
} else {
- return $ta ? -1 : +1;
+ return $tb - $ta;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php