MDL-55379 phpunit: Fixed hint_result for rerun

2016-09-12 09:48:39 +08:00
parent 0344082208
commit a7f202de4e
2 changed files with 20 additions and 15 deletions
@@ -52,13 +52,17 @@ function testing_cli_argument_path($moodlepath) {
        // This is the real CLI script, work with relative paths.
        $cwd = getcwd();
    }
+
+    // In sub path, we want to remove leading Directory separator.
+    $removeseparator = 0;
    if (substr($cwd, -1) !== DIRECTORY_SEPARATOR) {
-        $cwd .= DIRECTORY_SEPARATOR;
+        $removeseparator = 1;
    }
+
    $path = realpath($CFG->dirroot.$moodlepath);

    if (strpos($path, $cwd) === 0) {
-        $path = substr($path, strlen($cwd));
+        $path = substr($path, strlen($cwd) + $removeseparator);
    }

    if (testing_is_cygwin()) {