summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-07-22 18:19:45 +0200
committerStefan Zeiger <szeiger@novocode.com>2016-08-23 16:05:06 +0200
commite2b6c7b608b82fca5343f6d09236c2b48b5d824d (patch)
tree3f3b8b6b0261bf5170143147047a2fa791bf1312 /test
parent74702078b14ccba1710dd714c1723bef879c46a0 (diff)
downloadscala-e2b6c7b608b82fca5343f6d09236c2b48b5d824d.tar.gz
scala-e2b6c7b608b82fca5343f6d09236c2b48b5d824d.tar.bz2
scala-e2b6c7b608b82fca5343f6d09236c2b48b5d824d.zip
Switch remaining uses of ant over to sbt
- Modify `tools/scaladoc-diff` to use sbt instead of ant. - Move `stability-test.sh` from `tools` to `scripts`. With the new build process without separate `locker` and `strap` stages, it doesn’t make sense to call this script without first setting up the proper test environment in a CI build. - Replace the use of `build.number` in `bootstrap` with a new `SHA-NIGHTLY` mode for `baseVersionSuffix`. - Make `partest` call sbt instead of ant for initializing the classpath and use the new classpath location (`quick` instead of `pack`).
Diffstat (limited to 'test')
-rwxr-xr-xtest/partest12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/partest b/test/partest
index 07a5de12af..d74176aa8a 100755
--- a/test/partest
+++ b/test/partest
@@ -28,7 +28,7 @@ findScalaHome () {
# that runs this script. I don't know why. it may have to do with
# which bash flags are set (-e? -x?) and with bash flags propagating
# from one script to another? not sure. anyway, normally in a CI
-# context we run partest through ant, not through this script, so I'm
+# context we run partest through sbt, not through this script, so I'm
# not investigating further for now.)
term_colors=$(tput colors 2>/dev/null)
if [[ $? == 0 ]] && [[ $term_colors -gt 2 ]]; then
@@ -54,14 +54,14 @@ if $cygwin; then
SCALA_HOME=`cygpath --unix "$SCALA_HOME"`
fi
-# Let ant construct the classpath used to run partest (downloading partest from maven if necessary)
+# Let sbt construct the classpath used to run partest (downloading partest from maven if necessary)
# PARTEST_CLASSPATH=""
if [ -z "$PARTEST_CLASSPATH" ] ; then
- if [ ! -f "$SCALA_HOME/build/pack/partest.properties" ] ; then
- (cd "$SCALA_HOME" && ant -q test.suite.init) # builds pack, downloads partest and writes classpath to build/pack/partest.properties
+ if [ ! -f "$SCALA_HOME/build/quick/partest.properties" ] ; then
+ (cd "$SCALA_HOME" && sbt dist/mkQuick) # builds quick, downloads partest and writes classpath to build/quick/partest.properties
fi
- PARTEST_CLASSPATH=$( cat "$SCALA_HOME/build/pack/partest.properties" | grep partest.classpath | sed -e 's/\\:/:/g' | cut -f2- -d= )
+ PARTEST_CLASSPATH=$( cat "$SCALA_HOME/build/quick/partest.properties" | grep partest.classpath | sed -e 's/\\:/:/g' | cut -f2- -d= )
# sanity check, disabled to save time
# $( javap -classpath $PARTEST_CLASSPATH scala.tools.partest.nest.NestRunner &> /dev/null ) || unset PARTEST_CLASSPATH
@@ -126,7 +126,7 @@ fi
# supplied argument will be used.
JAVA_OPTS="-Xmx1024M -Xms64M $JAVA_OPTS"
-# the ant task doesn't supply any options by default,
+# the sbt task doesn't supply any options by default,
# so don't do that here either -- note that you may want to pass -optimise
# to mimic what happens during nightlies.
# [ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation"