diff options
| author | michelou <michelou@epfl.ch> | 2007-11-13 17:49:56 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-11-13 17:49:56 +0000 |
| commit | 96f925078fdcf764e84f4691e6589004f09ca709 (patch) | |
| tree | 007d4a188f8ccb80d58a6f81642d9b8f1fc730cd /test/partest | |
| parent | bdc8a6a607b599a7292e55a45634f2177c77ee76 (diff) | |
| download | scala-96f925078fdcf764e84f4691e6589004f09ca709.tar.gz scala-96f925078fdcf764e84f4691e6589004f09ca709.tar.bz2 scala-96f925078fdcf764e84f4691e6589004f09ca709.zip | |
fixed partest, removed mergeLines (useless)
Diffstat (limited to 'test/partest')
| -rwxr-xr-x | test/partest | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/partest b/test/partest index 31e3680b32..bcc1c8a84b 100755 --- a/test/partest +++ b/test/partest @@ -449,10 +449,10 @@ test_check_kind() { fi; scala_lib=`get_os_filename "$SCALA_LIB"` && classpath=`get_os_pathlist $CLASSPATH` && - # -Djava.library.path $SCALA -DSCALA=$SCALA -DJAVA_OPTS="$java_opts -Xss16M" \ - -DJVMEXTCP=$JVM_EXT_CLASSPATH -Dscalatest.lib=$scala_lib -DCLASSPATH=$classpath \ + -DJVMEXTCP=$JVM_EXT_CLASSPATH -DCLASSPATH=$classpath \ -Dactors.corePoolsize=7 -Dactors.maxPoolSize=8 \ + -Dscalatest.lib=$scala_lib -classpath $classpath \ scala.tools.partest.TestRunner --"$kind" $testdir $resfile 2> /dev/null; load_results; elif [ "$kind" = "shootout" ]; then |