diff options
| author | michelou <michelou@epfl.ch> | 2007-06-11 12:09:35 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-06-11 12:09:35 +0000 |
| commit | d2d5fb166c5c7294b0459732b3fa3815b8d82fda (patch) | |
| tree | 04ed62066f0f8a45568f0f0b18762596a3ddd94e /test/scalatest | |
| parent | 908decebd0f890068221ff586ebd7b3492f37c0f (diff) | |
| download | scala-d2d5fb166c5c7294b0459732b3fa3815b8d82fda.tar.gz scala-d2d5fb166c5c7294b0459732b3fa3815b8d82fda.tar.bz2 scala-d2d5fb166c5c7294b0459732b3fa3815b8d82fda.zip | |
added test for @native attribute
Diffstat (limited to 'test/scalatest')
| -rwxr-xr-x | test/scalatest | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/scalatest b/test/scalatest index 7dc76614f4..4dbac001ea 100755 --- a/test/scalatest +++ b/test/scalatest @@ -265,9 +265,10 @@ test_run_jvm() { rm -rf "$dstbase".obj && mkdir -p "$dstbase".obj && env JAVACMD="$JAVACMD" JAVA_OPTS="$javaopts" $SCALAC -d "$os_dstbase".obj -cp "$JVM_EXT_CLASSPATH" "$@" "$os_srcbase".scala && + scala_javaopts=`echo -Djava.library.path=$dstdir` && scala_lib=`get_os_filename "$SCALA_LIB"` && classpath=`get_os_pathlist "$os_dstbase".obj:$CLASSPATH` && - $SCALA -Djavacmd="$JAVACMD" -Dscalatest.output=$os_dstbase.obj -Dscalatest.lib=$scala_lib -classpath $classpath:$JVM_EXT_CLASSPATH Test "jvm" && + env JAVA_OPTS="$scala_javaopts" $SCALA -Djavacmd="$JAVACMD" -Dscalatest.output=$os_dstbase.obj -Dscalatest.lib=$scala_lib -classpath $classpath:$JVM_EXT_CLASSPATH Test "jvm" && rm -rf "$dstbase".obj; } |