diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-11-14 16:55:21 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-11-14 16:55:21 +0000 |
| commit | 1ce2b54384639ff358071e8965a5cf39a5a43882 (patch) | |
| tree | 4b17bb9ca078870b163db66db8f3ba77849ade00 /test | |
| parent | d71d7bb6f1f6924cb27662b73fdcbf2b37bfd3ae (diff) | |
| download | scala-1ce2b54384639ff358071e8965a5cf39a5a43882.tar.gz scala-1ce2b54384639ff358071e8965a5cf39a5a43882.tar.bz2 scala-1ce2b54384639ff358071e8965a5cf39a5a43882.zip | |
*** empty log message ***
Diffstat (limited to 'test')
| -rwxr-xr-x | test/bin/scala-test | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/test/bin/scala-test b/test/bin/scala-test index a5eb1b7792..c65bf619b5 100755 --- a/test/bin/scala-test +++ b/test/bin/scala-test @@ -126,10 +126,13 @@ test_compilation() { classpath="$SCALA:$output"; if $CYGWIN; then classpath=`cygpath -w -p "$classpath"`; + os_output=`cygpath -w "$output"`; + else + os_output="$output"; fi; rm -rf "$output"; mkdir -p "$output" && - $SOCOS -d "$output" $TEST_FLAGS $FLAGS "$source" && + $SOCOS -d "$os_output" $TEST_FLAGS $FLAGS "$source" && java -classpath "$classpath" Test && rm -rf "$output"; } @@ -143,20 +146,28 @@ test_xml() { classpath="$SCALA:$output"; if $CYGWIN; then classpath=`cygpath -w -p "$classpath"`; + os_output=`cygpath -w "$output"`; + else + os_output="$output"; fi; rm -rf "$output"; mkdir -p "$output" && - $DTD2SCALA -d "$output" "$dtdfile" dtd && - $SOCOS -d "$output" $TEST_FLAGS $FLAGS "$objfile" "$source" && + $DTD2SCALA -d "$os_output" "$dtdfile" dtd && + $SOCOS -d "$os_output" $TEST_FLAGS $FLAGS "$objfile" "$source" && java -classpath "$classpath" Test "$xmlfile" && rm -rf "$output"; } test_compilation_success() { output="$OBJDIR"/`expr "$source" : "\(.*\)\\.scala"`-$KIND.obj; + if $CYGWIN; then + os_output=`cygpath -w "$output"`; + else + os_output="$output"; + fi; rm -rf "$output"; mkdir -p "$output" && - $SOCOS -d "$output" $TEST_FLAGS $FLAGS "$source" && + $SOCOS -d "$os_output" $TEST_FLAGS $FLAGS "$source" && rm -rf "$output"; } |