summaryrefslogtreecommitdiff
path: root/test/clitest
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-04-24 15:23:41 +0000
committermichelou <michelou@epfl.ch>2006-04-24 15:23:41 +0000
commitbf78330b04faa32d89db4b7f452f4443b368ac47 (patch)
tree5fafd81b5b0c68245b598c87cefd97b7b2b9446d /test/clitest
parent1819fb81bfb65e97acce6d45eda237735c65b01c (diff)
downloadscala-bf78330b04faa32d89db4b7f452f4443b368ac47.tar.gz
scala-bf78330b04faa32d89db4b7f452f4443b368ac47.tar.bz2
scala-bf78330b04faa32d89db4b7f452f4443b368ac47.zip
fixed check error for option '--jikes'
Diffstat (limited to 'test/clitest')
-rwxr-xr-xtest/clitest10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/clitest b/test/clitest
index 634fa5700c..c102430d68 100755
--- a/test/clitest
+++ b/test/clitest
@@ -131,10 +131,12 @@ test_compile() {
info="$1"; shift 1;
[ -d "$OUTPUT_DIR" ] || mkdir -p $OUTPUT_DIR;
[ -f "$LOG_FILE" ] && rm $LOG_FILE;
- suffix=".$COMPILER"
- [ "$LANG" = "java5" ] && suffix="${suffix}5";
- [ "$LANG" = "java6" ] && suffix="${suffix}6";
-
+ if [ "$COMPILER" = "javac" ]; then
+ [ "$LANG" = "java5" ] && suffix=".${COMPILER}5";
+ [ "$LANG" = "java6" ] && suffix=".${COMPILER}6";
+ else
+ suffix=".$COMPILER";
+ fi;
file=`echo $source | sed -e "s#$PREFIX/##g"`;
if [ "$LEVEL" = "info" ] || [ "$LEVEL" = "verbose" ] ; then
printf_outline "\\nSource file: $file\\n"