diff options
| author | mihaylov <mihaylov@epfl.ch> | 2006-07-05 12:36:25 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2006-07-05 12:36:25 +0000 |
| commit | 4308d3971bc031afcd31a9b4c78b3b06ec80242f (patch) | |
| tree | 357e5e3574e4e96514a3e89f0fe355d49b045cf6 | |
| parent | fb129da2516f17f1e28434561c1d921b11a04598 (diff) | |
| download | scala-4308d3971bc031afcd31a9b4c78b3b06ec80242f.tar.gz scala-4308d3971bc031afcd31a9b4c78b3b06ec80242f.tar.bz2 scala-4308d3971bc031afcd31a9b4c78b3b06ec80242f.zip | |
Created a directory test/files/jvm5/ for test c...
Created a directory test/files/jvm5/ for test cases that run only on JVM
1.5
| -rw-r--r-- | test/files/jvm5/attributes.check (renamed from test/files/run/attributes.check) | 0 | ||||
| -rw-r--r-- | test/files/jvm5/attributes.scala (renamed from test/files/run/attributes.scala) | 0 | ||||
| -rwxr-xr-x | test/scalatest | 19 |
3 files changed, 18 insertions, 1 deletions
diff --git a/test/files/run/attributes.check b/test/files/jvm5/attributes.check index 2793231eac..2793231eac 100644 --- a/test/files/run/attributes.check +++ b/test/files/jvm5/attributes.check diff --git a/test/files/run/attributes.scala b/test/files/jvm5/attributes.scala index 051355a947..051355a947 100644 --- a/test/files/run/attributes.scala +++ b/test/files/jvm5/attributes.scala diff --git a/test/scalatest b/test/scalatest index 77c6cdb289..74f934a920 100755 --- a/test/scalatest +++ b/test/scalatest @@ -421,6 +421,10 @@ test_add_file() { esac; case "$1" in run | */run | */run/* | run/* ) FILES_RUN="$FILES_RUN $1";; + jvm5 | */jvm5 | */jvm5* | jvm5/* ) + if [ "$JAVA5" = "true" ]; then + FILES_JVM="$FILES_JVM $1" + fi;; jvm | */jvm | */jvm/* | jvm/* ) FILES_JVM="$FILES_JVM $1";; pos | */pos | */pos/* | pos/* ) FILES_POS="$FILES_POS $1";; neg | */neg | */neg/* | neg/* ) FILES_NEG="$FILES_NEG $1";; @@ -511,6 +515,11 @@ fi; BIN_DIR="$LATEST/" # BIN_DIR should have a trailing / when needed, so that # it can also be set to the empty string +case `${JAVACMD:=java} \-version 2>&1 | head -1` in + *1.5*) JAVA5="true";; + *) JAVA5="false";; +esac; + DIFF="diff"; case `uname` in @@ -549,6 +558,10 @@ while [ $# -gt 0 ]; do esac; done; +if [ "$JAVA5" = "true" ]; then + FLAGS="$FLAGS -target:jvm-1.5" +fi; + if [ -z "$ERRORS" ]; then abort "illegal non-numerical argument for option --errors"; fi; @@ -563,7 +576,11 @@ if [ "$TEST_ALL" = "true" ]; then run ) FILES_RUN="$FILES_RUN $SRCDIR/run";; esac; case "$TEST_TYPE" in - auto | jvm ) FILES_JVM="$FILES_JVM $SRCDIR/run $SRCDIR/jvm";; + auto | jvm ) + FILES_JVM="$FILES_JVM $SRCDIR/run $SRCDIR/jvm" + if [ "$JAVA5" = "true" ]; then + FILES_JVM="$FILES_JVM $SRCDIR/jvm5"; + fi;; esac; case "$TEST_TYPE" in auto | pos ) FILES_POS="$FILES_POS $SRCDIR/pos";; |