diff options
author | paltherr <paltherr@epfl.ch> | 2003-03-24 16:57:18 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2003-03-24 16:57:18 +0000 |
commit | 9cfe96647bc3d349d05f88ba058de807236603ff (patch) | |
tree | e785eb4ef5fb41299f49b62be5c235d87694b784 /test/bin/scala-test | |
parent | bbd53b7ccb91a9063547bb99fea15d4234c5b170 (diff) | |
download | scala-9cfe96647bc3d349d05f88ba058de807236603ff.tar.gz scala-9cfe96647bc3d349d05f88ba058de807236603ff.tar.bz2 scala-9cfe96647bc3d349d05f88ba058de807236603ff.zip |
- Changed some names so that --jvm and --int ge...
- Changed some names so that --jvm and --int generate diffrent log files
Diffstat (limited to 'test/bin/scala-test')
-rwxr-xr-x | test/bin/scala-test | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/test/bin/scala-test b/test/bin/scala-test index 1a57e66ca7..11724fc59b 100755 --- a/test/bin/scala-test +++ b/test/bin/scala-test @@ -122,7 +122,7 @@ test_interpretation() { } test_compilation() { - output="$OBJDIR"/`expr "$source" : "\(.*\)\\.scala"`.obj; + output="$OBJDIR"/`expr "$source" : "\(.*\)\\.scala"`-$KIND.obj; classpath="$SCALA:$output"; if $CYGWIN; then classpath=`cygpath -w -p "$classpath"`; @@ -135,7 +135,7 @@ test_compilation() { } test_compilation_success() { - output="$OBJDIR"/`expr "$source" : "\(.*\)\\.scala"`.obj; + output="$OBJDIR"/`expr "$source" : "\(.*\)\\.scala"`-$KIND.obj; rm -rf "$output"; mkdir -p "$output" && $SOCOS -d "$output" $FLAGS "$source" && @@ -156,9 +156,9 @@ test_output() { test_file() { source="$FILE"; - expect="`expr "$source" : "\(.*\)\\.scala"`.check"; - actual="`expr "$source" : "\(.*\)\\.scala"`.log"; flags="`expr "$source" : "\(.*\)\\.scala"`.flags"; + expect="`expr "$source" : "\(.*\)\\.scala"`.check"; + actual="`expr "$source" : "\(.*\)\\.scala"`-$KIND.log"; if [ -f "$flags" ]; then FLAGS=`cat $flags`; else @@ -200,6 +200,7 @@ test_one() { HEAD="false"; TEXT="$1"; shift 1; TEST="$1"; shift 1; + KIND="$1"; shift 1; for FROM do if [ -d "$FROM" -o -f "$FROM" ]; then @@ -224,13 +225,13 @@ test_all() { echo ""; test_one "Testing interpreter" \ - test_interpretation $FILES_RUN $FILES_INT; + test_interpretation "int" $FILES_RUN $FILES_INT; test_one "Testing jvm backend" \ - test_compilation $FILES_RUN $FILES_JVM; + test_compilation "jvm" $FILES_RUN $FILES_JVM; test_one "Testing compiler (on files whose compilation should succeed)" \ - test_compilation_success $FILES_POS; + test_compilation_success "pos" $FILES_POS; test_one "Testing compiler (on files whose compilation should fail)" \ - test_compilation_failure $FILES_NEG; + test_compilation_failure "neg" $FILES_NEG; } ############################################################################## |