diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-25 16:34:57 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-25 16:34:57 -0800 |
| commit | 1e1d6b42d05df6c1a69ef83463986847648831d9 (patch) | |
| tree | 98cd014636542dfd07abcf12aae08c59b9e30c9b /test/partest | |
| parent | 1eee7a22912dbc8d8d52d42a4bcaf6642b0fffe0 (diff) | |
| parent | e7ecaa00bbd5387870d0c26df4d8fba128b59c9e (diff) | |
| download | scala-1e1d6b42d05df6c1a69ef83463986847648831d9.tar.gz scala-1e1d6b42d05df6c1a69ef83463986847648831d9.tar.bz2 scala-1e1d6b42d05df6c1a69ef83463986847648831d9.zip | |
Merge commit 'e7ecaa00bb' into pr/merge-2.10
Conflicts:
test/partest
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 6d9fc01cd5..2bd8ce94f3 100755 --- a/test/partest +++ b/test/partest @@ -83,8 +83,8 @@ fi # last arg wins, so if JAVA_OPTS already contains -Xmx or -Xms the # supplied argument will be used. JAVA_OPTS="-Xmx1024M -Xms64M $JAVA_OPTS" -# the ant task doesn't supply any options by default, -# so don't to that here either -- note that you may want to pass -optimise +# the ant task doesn't supply any options by default, +# so don't to that here either -- note that you may want to pass -optimise # to mimic what happens during nightlies # [ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation" |