diff --git a/.travis.yml b/.travis.yml
index cc7dbc500..8c70391cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,11 +45,23 @@ matrix:
allow_failures:
- os: osx
+before_install:
+ - |
+ run() {
+ ID=`echo "$@" | sed -e 's/ /_/g'`
+ STR=`echo "$@"`
+ printf "travis_fold:start:$ID\n$STR\n"
+ eval "$@"
+ printf "travis_fold:end:$ID\n"
+ }
+
+
install: |
+ printf "travis_fold:start:downloads\nLoad JDK and/or Eclipse\n"
if [ "$TRAVIS_OS_NAME" = "linux" ]
then
JDK_TAR=${TRAVIS_BUILD_DIR}/../jdk.tar.gz
- wget https://github.com/graalvm/openjdk8-jvmci-builder/releases/download/${JVMCI_VERSION}/openjdk-8u${JDK8_UPDATE_VERSION}-${JVMCI_VERSION}-linux-amd64.tar.gz -O ${JDK_TAR}
+ wget --progress=bar:force https://github.com/graalvm/openjdk8-jvmci-builder/releases/download/${JVMCI_VERSION}/openjdk-8u${JDK8_UPDATE_VERSION}-${JVMCI_VERSION}-linux-amd64.tar.gz -O ${JDK_TAR}
tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${JDK_TAR}
export JVMCI_HOME=${TRAVIS_BUILD_DIR}/../openjdk1.8.0_${JDK8_UPDATE_VERSION}-${JVMCI_VERSION}
fi
@@ -58,18 +70,21 @@ install: |
then
export ECLIPSE_TAR=eclipse.tar.gz
export ECLIPSE_URL=http://archive.eclipse.org/eclipse/downloads/drops4/R-4.6.3-201703010400/eclipse-SDK-4.6.3-linux-gtk-x86_64.tar.gz
- wget ${ECLIPSE_URL} -O ${ECLIPSE_TAR}
+ wget --progress=bar:force ${ECLIPSE_URL} -O ${ECLIPSE_TAR}
tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${ECLIPSE_TAR}
export ECLIPSE_EXE=${TRAVIS_BUILD_DIR}/../eclipse/eclipse
fi
export SG=-Dskip.graal=true
+ export ANT="ant -e $SG"
+ printf "travis_fold:end:downloads\n"
+
script:
- - if [ "$TASK" = "core-tests" ]; then ant $SG core-tests && ant $SG serialization-tests && ant $SG coverage; fi
- - if [ "$TASK" = "checkstyle" ]; then ant $SG checkstyle && ant $SG eclipseformat-check && cd tools/kompos && nvm install 7 && npm install && npm run lint; fi
- - if [ "$TASK" = "kompos-tests" ]; then nvm install 8 && ant $SG && cd tools/kompos && npm -s run verify && npm test; fi
- - if [ "$TASK" = "replay1-tests" ]; then ant $SG compile && ./tests/replay/test.sh 1; fi
- - if [ "$TASK" = "replay2-tests" ]; then ant $SG compile && ./tests/replay/test.sh 2; fi
- - if [ "$TASK" = "snapshot-tests" ]; then ant $SG compile && ./tests/snapshot/test.sh; fi
- - if [ "$TASK" = "unit-tests" ]; then ant compile && ./som core-lib/TestSuite/TestRunner.ns; fi
- - if [ "$TASK" = "native" ]; then ant native; fi
+ - if [ "$TASK" = "core-tests" ]; then $ANT core-tests && $ANT serialization-tests && $ANT coverage; fi
+ - if [ "$TASK" = "checkstyle" ]; then $ANT checkstyle && $ANT eclipseformat-check && run cd tools/kompos && nvm install 7 && run npm install && run npm run lint; fi
+ - if [ "$TASK" = "kompos-tests" ]; then run nvm install 8 && $ANT && cd tools/kompos && run npm -s run verify && run npm test; fi
+ - if [ "$TASK" = "replay1-tests" ]; then $ANT compile && run ./tests/replay/test.sh 1; fi
+ - if [ "$TASK" = "replay2-tests" ]; then $ANT compile && run ./tests/replay/test.sh 2; fi
+ - if [ "$TASK" = "snapshot-tests" ]; then $ANT compile && run ./tests/snapshot/test.sh; fi
+ - if [ "$TASK" = "unit-tests" ]; then $ANT compile && run ./som core-lib/TestSuite/TestRunner.ns; fi
+ - if [ "$TASK" = "native" ]; then $ANT native; fi
diff --git a/build.xml b/build.xml
index 05d47bc7b..a24a452e0 100644
--- a/build.xml
+++ b/build.xml
@@ -80,7 +80,16 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -90,32 +99,47 @@
+
ant.java.version: ${ant.java.version}
java.version: ${java.version}
is.atLeastJava9: ${is.atLeastJava9}
kernel: ${kernel}
+ env.TRAVIS: ${env.TRAVIS}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -128,6 +152,7 @@
+
@@ -139,9 +164,11 @@
+
+
The used JDK needs to have JVMCI support, which is the case for Java 9.
If Java 8 is needed, see
@@ -153,9 +180,11 @@
+
+
@@ -165,6 +194,7 @@
+
@@ -183,12 +213,14 @@
+
+
@@ -198,6 +230,7 @@
+
@@ -222,9 +255,11 @@
+
+
@@ -236,15 +271,19 @@
+
+
+
+
@@ -252,9 +291,11 @@
+
+
@@ -262,22 +303,28 @@
+
+
+
+
+
+
@@ -299,20 +346,25 @@
+
+
+
+
+
@@ -323,6 +375,7 @@
+
@@ -349,9 +402,11 @@
+
+
@@ -368,9 +423,11 @@
+
+
@@ -379,16 +436,21 @@
+
+
+
+
+
@@ -401,23 +463,28 @@
+
+
+
+
+
@@ -447,15 +514,18 @@
+
+
+
@@ -464,6 +534,7 @@
+
@@ -496,5 +567,6 @@
+