diff options
| -rw-r--r-- | src/partest/scala/tools/partest/TestRunner.scala | 10 | ||||
| -rwxr-xr-x | test/partest | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/partest/scala/tools/partest/TestRunner.scala b/src/partest/scala/tools/partest/TestRunner.scala index f1edfe2d68..d39326a697 100644 --- a/src/partest/scala/tools/partest/TestRunner.scala +++ b/src/partest/scala/tools/partest/TestRunner.scala @@ -175,29 +175,29 @@ object TestRunner { val posFiles = getFiles("pos", posCheck) if (! posFiles.isEmpty) { - printOutline("Testing compiler (on files whose compilation should succeed)\n") + printOutline("\nTesting compiler (on files whose compilation should succeed)\n") for (file <- posFiles) master ! PosTest(file) } val negFiles = getFiles("neg", negCheck) if (! negFiles.isEmpty) { - printOutline("Testing compiler (on files whose compilation should fail)\n") + printOutline("\nTesting compiler (on files whose compilation should fail)\n") for (file <- negFiles) master ! NegTest(file) } val jvmFiles = getFiles("jvm", jvmCheck) ::: getFiles("run", jvmCheck) ::: getFiles("jvm5", jvmCheck && isJava5) if (! jvmFiles.isEmpty) { - printOutline("Testing JVM backend\n") + printOutline("\nTesting JVM backend\n") for (file <- jvmFiles) master ! JVMTest(file) } else { val runFiles = getFiles("run", runCheck) if (! runFiles.isEmpty) { - printOutline("Testing JVM backend\n") + printOutline("\nTesting JVM backend\n") for (file <- runFiles) master ! JVMTest(file) } } val shootFiles = getFiles("shootout", shootoutCheck) if (! shootFiles.isEmpty) { - printOutline("Testing shootout benchmarks\n") + printOutline("\nTesting shootout benchmarks\n") for (file <- shootFiles) master! ShootoutTest(createTestFile(file, "shootout")) } diff --git a/test/partest b/test/partest index 4ced476cd9..992b79faf9 100755 --- a/test/partest +++ b/test/partest @@ -431,10 +431,10 @@ test_check_kind() { [ $# -ge 2 ] || abort "internal error"; header="$1"; shift 1; kind="$1"; shift 1; - srcdir=`get_os_filename "$SRCDIR"`; - resfile=`get_os_filename "$RESFILE"`; if [ "$kind" = "res" ]; then TEST_EXT="res"; else TEST_EXT="scala"; fi; if [ "$kind" = "testrunner" ]; then + srcdir=`get_os_filename "$SRCDIR"`; + resfile=`get_os_filename "$RESFILE"`; javaopts=$JAVA_OPTS; if [ -f "$os_srcbase".javaopts ]; then javaopts="$javaopts `cat "$os_srcbase".javaopts`" @@ -458,7 +458,7 @@ test_check_kind() { scala.tools.partest.TestRunner $testargs $resfile 2> /dev/null; load_results; else - [ "$@" ] && printf_outline "$header\\n"; + [ "$@" ] && printf_outline "\\n$header\\n"; for file in "" "$@"; do [ -z "$file" ] && continue; test_check_file "$file"; @@ -850,7 +850,6 @@ else printf_outline "Ant version is : $ant_version\\n"; fi fi; -printf_outline "\\n"; START_SECONDS=`date +%s`; test_check_all; |