Move up general tests

# if MFH is needed should be decided by QA team: because the output # sequence changes

diff --git a/run-tests.php b/run-tests.php
index 2413a30cbec16f80c7997285269145fa3ae5181a..a3e999ec6fca91493ce4b9b756952e39550e52d8 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -236,12 +236,12 @@ function find_files($dir,$is_ext_dir=FALSE,$ignore=FALSE)
 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;
        }
 }