From 4f48d533fa0e557856eb66267525397365037e97 Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 00:56:14 +0800 Subject: [PATCH 01/12] divide and conquer --- .travis.yml | 44 +++++++++++++++---- .travis/before-install-linux-cpp.sh | 8 ++++ .travis/before-install-linux-csharp.sh | 10 +++++ ...ll-linux.sh => before-install-linux-go.sh} | 0 .travis/before-install-linux-java.sh | 7 +++ .travis/before-install-linux-python2.sh | 9 ++++ .travis/before-install-linux-python3.sh | 10 +++++ ...l-macos.sh => before-install-osx-swift.sh} | 5 --- .travis/run-tests-cpp.sh | 3 ++ .travis/run-tests-csharp.sh | 3 ++ .travis/run-tests-go.sh | 3 ++ .travis/run-tests-java.sh | 3 ++ .travis/run-tests-javascript.sh | 3 ++ .travis/run-tests-linux.sh | 10 ----- .travis/run-tests-python2.sh | 3 ++ .travis/run-tests-python3.sh | 3 ++ ...{run-tests-macos.sh => run-tests-swift.sh} | 0 17 files changed, 101 insertions(+), 23 deletions(-) create mode 100755 .travis/before-install-linux-cpp.sh create mode 100755 .travis/before-install-linux-csharp.sh rename .travis/{before-install-linux.sh => before-install-linux-go.sh} (100%) create mode 100755 .travis/before-install-linux-java.sh create mode 100755 .travis/before-install-linux-python2.sh create mode 100755 .travis/before-install-linux-python3.sh rename .travis/{before-install-macos.sh => before-install-osx-swift.sh} (72%) create mode 100755 .travis/run-tests-cpp.sh create mode 100755 .travis/run-tests-csharp.sh create mode 100755 .travis/run-tests-go.sh create mode 100755 .travis/run-tests-java.sh create mode 100755 .travis/run-tests-javascript.sh delete mode 100755 .travis/run-tests-linux.sh create mode 100755 .travis/run-tests-python2.sh create mode 100755 .travis/run-tests-python3.sh rename .travis/{run-tests-macos.sh => run-tests-swift.sh} (100%) diff --git a/.travis.yml b/.travis.yml index f65bf985f..7469664ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,52 @@ sudo: true +language: java + +env: + - TARGET=java + - TARGET=csharp + - TARGET=python2 + - TARGET=python3 + - TARGET=javascript + - TARGET=cpp + - TARGET=go + - TARGET=swift + matrix: include: - os: linux env: CXX=g++-5 compiler: clang - language: java jdk: oraclejdk7 - os: osx compiler: clang - language: java osx_image: xcode8.1 + exclude: + - os: linux + env: TARGET=swift + - os: osx + env: TARGET=java + - os: osx + env: TARGET=csharp + - os: osx + env: TARGET=python2 + - os: osx + env: TARGET=python3 + - os: osx + env: TARGET=javascript + - os: osx + env: TARGET=cpp + - os: osx + env: TARGET=go + +before_install: + - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh + - fi script: - - if [[ $TRAVIS_OS_NAME == osx ]]; then cd runtime-testsuite; ../.travis/run-tests-macos.sh; fi - - if [[ $TRAVIS_OS_NAME == linux ]]; then cd runtime-testsuite; ../.travis/run-tests-linux.sh; fi - -before_install: - - if [[ $TRAVIS_OS_NAME == osx ]]; then ./.travis/before-install-macos.sh; fi - - if [[ $TRAVIS_OS_NAME == linux ]]; then ./.travis/before-install-linux.sh; fi + - cd runtime-testsuite + - ../.travis/run-tests-$TARGET.sh + - fi addons: apt: diff --git a/.travis/before-install-linux-cpp.sh b/.travis/before-install-linux-cpp.sh new file mode 100755 index 000000000..c5bf43614 --- /dev/null +++ b/.travis/before-install-linux-cpp.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -euo pipefail + +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +sudo add-apt-repository ppa:fkrull/deadsnakes -y +sudo add-apt-repository ppa:rwky/nodejs -y +sudo apt-get update -qq diff --git a/.travis/before-install-linux-csharp.sh b/.travis/before-install-linux-csharp.sh new file mode 100755 index 000000000..048d147d7 --- /dev/null +++ b/.travis/before-install-linux-csharp.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -euo pipefail + +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +sudo add-apt-repository ppa:fkrull/deadsnakes -y +sudo add-apt-repository ppa:rwky/nodejs -y +sudo apt-get update -qq +echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/3.12.1 main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list +sudo apt-get install -qq mono-complete diff --git a/.travis/before-install-linux.sh b/.travis/before-install-linux-go.sh similarity index 100% rename from .travis/before-install-linux.sh rename to .travis/before-install-linux-go.sh diff --git a/.travis/before-install-linux-java.sh b/.travis/before-install-linux-java.sh new file mode 100755 index 000000000..fc927107f --- /dev/null +++ b/.travis/before-install-linux-java.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -euo pipefail + +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +sudo add-apt-repository ppa:fkrull/deadsnakes -y +sudo apt-get update -qq diff --git a/.travis/before-install-linux-python2.sh b/.travis/before-install-linux-python2.sh new file mode 100755 index 000000000..79ae76f6e --- /dev/null +++ b/.travis/before-install-linux-python2.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -euo pipefail + +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +sudo add-apt-repository ppa:fkrull/deadsnakes -y +sudo add-apt-repository ppa:rwky/nodejs -y +sudo apt-get update -qq +python --version diff --git a/.travis/before-install-linux-python3.sh b/.travis/before-install-linux-python3.sh new file mode 100755 index 000000000..abfce1d81 --- /dev/null +++ b/.travis/before-install-linux-python3.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -euo pipefail + +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +sudo add-apt-repository ppa:fkrull/deadsnakes -y +sudo add-apt-repository ppa:rwky/nodejs -y +sudo apt-get update -qq +sudo apt-get install -qq python3.5 +python3 --version diff --git a/.travis/before-install-macos.sh b/.travis/before-install-osx-swift.sh similarity index 72% rename from .travis/before-install-macos.sh rename to .travis/before-install-osx-swift.sh index 00d68d433..145a505c6 100755 --- a/.travis/before-install-macos.sh +++ b/.travis/before-install-osx-swift.sh @@ -5,13 +5,8 @@ set -euo pipefail thisdir=$(dirname "$0") brew update -brew install mono python3 cmake # Work around apparent rvm bug that is in Travis's Xcode image. # https://github.com/direnv/direnv/issues/210 # https://github.com/travis-ci/travis-ci/issues/6307 shell_session_update() { :; } - -( go version ; go env ) || true -python --version -python3 --version diff --git a/.travis/run-tests-cpp.sh b/.travis/run-tests-cpp.sh new file mode 100755 index 000000000..5e8b018f3 --- /dev/null +++ b/.travis/run-tests-cpp.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +mvn -Dtest=cpp.* test # timeout due to no output for 10 min on travis if in parallel diff --git a/.travis/run-tests-csharp.sh b/.travis/run-tests-csharp.sh new file mode 100755 index 000000000..3bb35c098 --- /dev/null +++ b/.travis/run-tests-csharp.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +mvn -Dparallel=methods -DthreadCount=4 -Dtest=csharp.* test diff --git a/.travis/run-tests-go.sh b/.travis/run-tests-go.sh new file mode 100755 index 000000000..ce194d7f1 --- /dev/null +++ b/.travis/run-tests-go.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +mvn -Dparallel=methods -DthreadCount=4 -Dtest=go.* test diff --git a/.travis/run-tests-java.sh b/.travis/run-tests-java.sh new file mode 100755 index 000000000..43c17a76c --- /dev/null +++ b/.travis/run-tests-java.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +mvn -Dparallel=methods -DthreadCount=4 -Dtest=java.* test diff --git a/.travis/run-tests-javascript.sh b/.travis/run-tests-javascript.sh new file mode 100755 index 000000000..17ea458a1 --- /dev/null +++ b/.travis/run-tests-javascript.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +mvn -Dparallel=methods -DthreadCount=4 -Dtest=node.* test diff --git a/.travis/run-tests-linux.sh b/.travis/run-tests-linux.sh deleted file mode 100755 index 232d36149..000000000 --- a/.travis/run-tests-linux.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -mvn -Dparallel=methods -DthreadCount=4 -Dtest=java.* test -mvn -Dparallel=methods -DthreadCount=4 -Dtest=csharp.* test -mvn -Dparallel=methods -DthreadCount=4 -Dtest=python2.* test -mvn -Dparallel=methods -DthreadCount=4 -Dtest=python3.* test -mvn -Dparallel=methods -DthreadCount=4 -Dtest=node.* test -mvn -Dparallel=methods -DthreadCount=4 -Dtest=go.* test -mvn -Dtest=cpp.* test # timeout due to no output for 10 min on travis if in parallel -#mvn -Dparallel=methods -DthreadCount=4 -Dtest=swift.* test diff --git a/.travis/run-tests-python2.sh b/.travis/run-tests-python2.sh new file mode 100755 index 000000000..355dabaa8 --- /dev/null +++ b/.travis/run-tests-python2.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +mvn -Dparallel=methods -DthreadCount=4 -Dtest=python2.* test diff --git a/.travis/run-tests-python3.sh b/.travis/run-tests-python3.sh new file mode 100755 index 000000000..d3e6f2e51 --- /dev/null +++ b/.travis/run-tests-python3.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +mvn -Dparallel=methods -DthreadCount=4 -Dtest=python3.* test diff --git a/.travis/run-tests-macos.sh b/.travis/run-tests-swift.sh similarity index 100% rename from .travis/run-tests-macos.sh rename to .travis/run-tests-swift.sh From ab3bba906d3abfa4b4c4d858416d5dd1fbd05795 Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 01:07:30 +0800 Subject: [PATCH 02/12] divide and conquer --- .travis.yml | 24 +++++++++++------------- .travis/before-install-linux-cpp.sh | 2 ++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7469664ca..46bfaa1b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,15 @@ sudo: true +os: + - linux + - osx + language: java + - jdk: oraclejdk7 + +compiler: clang + +osx_image: xcode8.1 env: - TARGET=java @@ -13,14 +22,6 @@ env: - TARGET=swift matrix: - include: - - os: linux - env: CXX=g++-5 - compiler: clang - jdk: oraclejdk7 - - os: osx - compiler: clang - osx_image: xcode8.1 exclude: - os: linux env: TARGET=swift @@ -40,13 +41,10 @@ matrix: env: TARGET=go before_install: - - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh - - fi + - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh; fi script: - - cd runtime-testsuite - - ../.travis/run-tests-$TARGET.sh - - fi + - cd runtime-testsuite; ../.travis/run-tests-$TARGET.sh; fi addons: apt: diff --git a/.travis/before-install-linux-cpp.sh b/.travis/before-install-linux-cpp.sh index c5bf43614..3ca500028 100755 --- a/.travis/before-install-linux-cpp.sh +++ b/.travis/before-install-linux-cpp.sh @@ -6,3 +6,5 @@ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328 sudo add-apt-repository ppa:fkrull/deadsnakes -y sudo add-apt-repository ppa:rwky/nodejs -y sudo apt-get update -qq + +export CXX=g++-5 From 48d3a458b595db455f6fd70482d251d9edf29429 Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 01:13:36 +0800 Subject: [PATCH 03/12] divide and conquer --- .travis.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 46bfaa1b8..b6451b113 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,10 @@ os: - osx language: java - - jdk: oraclejdk7 + +jdk: + - oraclejdk7 + - oraclejdk8 compiler: clang @@ -39,6 +42,24 @@ matrix: env: TARGET=cpp - os: osx env: TARGET=go + - os: osx + env: TARGET=csharp + jdk: oraclejdk7 + - os: osx + env: TARGET=python2 + jdk: oraclejdk7 + - os: osx + env: TARGET=python3 + jdk: oraclejdk7 + - os: osx + env: TARGET=javascript + jdk: oraclejdk7 + - os: osx + env: TARGET=cpp + jdk: oraclejdk7 + - os: osx + env: TARGET=go + jdk: oraclejdk7 before_install: - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh; fi From d1496ed76a2982e5b13a57ee3938f5e9cfd71030 Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 01:19:30 +0800 Subject: [PATCH 04/12] divide and conquer --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6451b113..4cf131f90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,10 +62,11 @@ matrix: jdk: oraclejdk7 before_install: - - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh; fi + - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh script: - - cd runtime-testsuite; ../.travis/run-tests-$TARGET.sh; fi + - cd runtime-testsuite + - ../.travis/run-tests-$TARGET.sh addons: apt: From bebdeedada4156ef60a961fcfb44c044cb8c4b53 Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 01:36:46 +0800 Subject: [PATCH 05/12] divide and conquer --- .travis.yml | 56 +++++++++++----------- .travis/before-install-linux-go.sh | 7 --- .travis/before-install-linux-java.sh | 1 + .travis/before-install-linux-javascript.sh | 9 ++++ 4 files changed, 39 insertions(+), 34 deletions(-) create mode 100755 .travis/before-install-linux-javascript.sh diff --git a/.travis.yml b/.travis.yml index 4cf131f90..367374077 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,38 @@ env: - TARGET=swift matrix: + include: + - env: TARGET=cpp + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - g++-5 + - uuid-dev + - clang-3.7 exclude: - os: linux env: TARGET=swift + - os: linux + env: TARGET=csharp + jdk: oraclejdk7 + - os: linux + env: TARGET=python2 + jdk: oraclejdk7 + - os: linux + env: TARGET=python3 + jdk: oraclejdk7 + - os: linux + env: TARGET=javascript + jdk: oraclejdk7 + - os: linux + env: TARGET=cpp + jdk: oraclejdk7 + - os: linux + env: TARGET=go + jdk: oraclejdk7 - os: osx env: TARGET=java - os: osx @@ -42,24 +71,6 @@ matrix: env: TARGET=cpp - os: osx env: TARGET=go - - os: osx - env: TARGET=csharp - jdk: oraclejdk7 - - os: osx - env: TARGET=python2 - jdk: oraclejdk7 - - os: osx - env: TARGET=python3 - jdk: oraclejdk7 - - os: osx - env: TARGET=javascript - jdk: oraclejdk7 - - os: osx - env: TARGET=cpp - jdk: oraclejdk7 - - os: osx - env: TARGET=go - jdk: oraclejdk7 before_install: - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh @@ -68,12 +79,3 @@ script: - cd runtime-testsuite - ../.travis/run-tests-$TARGET.sh -addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - packages: - - g++-5 - - uuid-dev - - clang-3.7 diff --git a/.travis/before-install-linux-go.sh b/.travis/before-install-linux-go.sh index 43ae79c68..96a763927 100755 --- a/.travis/before-install-linux-go.sh +++ b/.travis/before-install-linux-go.sh @@ -6,12 +6,5 @@ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328 sudo add-apt-repository ppa:fkrull/deadsnakes -y sudo add-apt-repository ppa:rwky/nodejs -y sudo apt-get update -qq -sudo apt-get install -qq python3.5 -sudo apt-get install -qq nodejs -echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/3.12.1 main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list -sudo apt-get install -qq mono-complete eval "$(sudo gimme 1.7.3)" - ( go version ; go env ) || true -python --version -python3 --version diff --git a/.travis/before-install-linux-java.sh b/.travis/before-install-linux-java.sh index fc927107f..c5bf43614 100755 --- a/.travis/before-install-linux-java.sh +++ b/.travis/before-install-linux-java.sh @@ -4,4 +4,5 @@ set -euo pipefail sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF sudo add-apt-repository ppa:fkrull/deadsnakes -y +sudo add-apt-repository ppa:rwky/nodejs -y sudo apt-get update -qq diff --git a/.travis/before-install-linux-javascript.sh b/.travis/before-install-linux-javascript.sh new file mode 100755 index 000000000..42bea10fa --- /dev/null +++ b/.travis/before-install-linux-javascript.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -euo pipefail + +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +sudo add-apt-repository ppa:fkrull/deadsnakes -y +sudo add-apt-repository ppa:rwky/nodejs -y +sudo apt-get update -qq +sudo apt-get install -qq nodejs From dd7dcf089d6a114d0387d180f29fd10344185c2c Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 01:39:04 +0800 Subject: [PATCH 06/12] divide and conquer --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 367374077..4b9aa3154 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,14 +28,14 @@ matrix: include: - env: TARGET=cpp addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - packages: - - g++-5 - - uuid-dev - - clang-3.7 + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - g++-5 + - uuid-dev + - clang-3.7 exclude: - os: linux env: TARGET=swift From 874fea8cc61c81d798ee2beb979b2df10c23618e Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 01:43:15 +0800 Subject: [PATCH 07/12] reverting to global add ons for now --- .travis.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b9aa3154..504b5283d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,17 +25,6 @@ env: - TARGET=swift matrix: - include: - - env: TARGET=cpp - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - packages: - - g++-5 - - uuid-dev - - clang-3.7 exclude: - os: linux env: TARGET=swift @@ -79,3 +68,12 @@ script: - cd runtime-testsuite - ../.travis/run-tests-$TARGET.sh +addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - g++-5 + - uuid-dev + - clang-3.7 From c3f9cb3cc7178164c5a982cc6b2763e5c73bca3e Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 02:22:18 +0800 Subject: [PATCH 08/12] divide and conquer --- .travis.yml | 68 +++++++++++-------------------- .travis/before-install-osx-cpp.sh | 12 ++++++ .travis/run-tests-cpp.sh | 2 +- .travis/run-tests-csharp.sh | 2 +- .travis/run-tests-go.sh | 2 +- .travis/run-tests-java.sh | 2 +- .travis/run-tests-javascript.sh | 2 +- .travis/run-tests-python2.sh | 2 +- .travis/run-tests-python3.sh | 2 +- .travis/run-tests-swift.sh | 2 +- 10 files changed, 43 insertions(+), 53 deletions(-) create mode 100755 .travis/before-install-osx-cpp.sh diff --git a/.travis.yml b/.travis.yml index 504b5283d..9707fc9cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,66 +1,44 @@ sudo: true -os: - - linux - - osx - language: java -jdk: - - oraclejdk7 - - oraclejdk8 - compiler: clang -osx_image: xcode8.1 - -env: - - TARGET=java - - TARGET=csharp - - TARGET=python2 - - TARGET=python3 - - TARGET=javascript - - TARGET=cpp - - TARGET=go - - TARGET=swift - matrix: - exclude: + include: - os: linux - env: TARGET=swift - - os: linux - env: TARGET=csharp jdk: oraclejdk7 - - os: linux - env: TARGET=python2 - jdk: oraclejdk7 - - os: linux - env: TARGET=python3 - jdk: oraclejdk7 - - os: linux - env: TARGET=javascript - jdk: oraclejdk7 - - os: linux env: TARGET=cpp - jdk: oraclejdk7 - os: linux - env: TARGET=go jdk: oraclejdk7 - - os: osx env: TARGET=java - - os: osx + - os: linux + jdk: oraclejdk8 + env: TARGET=java + - os: linux + jdk: oraclejdk7 env: TARGET=csharp - - os: osx + - os: linux + jdk: oraclejdk7 env: TARGET=python2 - - os: osx + - os: linux + jdk: oraclejdk7 env: TARGET=python3 - - os: osx + - os: linux + jdk: oraclejdk7 env: TARGET=javascript - - os: osx - env: TARGET=cpp - - os: osx + - os: linux + jdk: oraclejdk7 env: TARGET=go - + - os: osx + compiler: clang + osx_image: xcode8.1 + env: TARGET=swift + - os: osx + compiler: clang + osx_image: xcode8.1 + env: TARGET=cpp + before_install: - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh diff --git a/.travis/before-install-osx-cpp.sh b/.travis/before-install-osx-cpp.sh new file mode 100755 index 000000000..145a505c6 --- /dev/null +++ b/.travis/before-install-osx-cpp.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -euo pipefail + +thisdir=$(dirname "$0") + +brew update + +# Work around apparent rvm bug that is in Travis's Xcode image. +# https://github.com/direnv/direnv/issues/210 +# https://github.com/travis-ci/travis-ci/issues/6307 +shell_session_update() { :; } diff --git a/.travis/run-tests-cpp.sh b/.travis/run-tests-cpp.sh index 5e8b018f3..ad32820c7 100755 --- a/.travis/run-tests-cpp.sh +++ b/.travis/run-tests-cpp.sh @@ -1,3 +1,3 @@ #!/bin/bash -mvn -Dtest=cpp.* test # timeout due to no output for 10 min on travis if in parallel +mvn -q -Dtest=cpp.* test # timeout due to no output for 10 min on travis if in parallel diff --git a/.travis/run-tests-csharp.sh b/.travis/run-tests-csharp.sh index 3bb35c098..ff61b22ae 100755 --- a/.travis/run-tests-csharp.sh +++ b/.travis/run-tests-csharp.sh @@ -1,3 +1,3 @@ #!/bin/bash -mvn -Dparallel=methods -DthreadCount=4 -Dtest=csharp.* test +mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=csharp.* test diff --git a/.travis/run-tests-go.sh b/.travis/run-tests-go.sh index ce194d7f1..42201da63 100755 --- a/.travis/run-tests-go.sh +++ b/.travis/run-tests-go.sh @@ -1,3 +1,3 @@ #!/bin/bash -mvn -Dparallel=methods -DthreadCount=4 -Dtest=go.* test +mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=go.* test diff --git a/.travis/run-tests-java.sh b/.travis/run-tests-java.sh index 43c17a76c..e93a00599 100755 --- a/.travis/run-tests-java.sh +++ b/.travis/run-tests-java.sh @@ -1,3 +1,3 @@ #!/bin/bash -mvn -Dparallel=methods -DthreadCount=4 -Dtest=java.* test +mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=java.* test diff --git a/.travis/run-tests-javascript.sh b/.travis/run-tests-javascript.sh index 17ea458a1..0e3d825dc 100755 --- a/.travis/run-tests-javascript.sh +++ b/.travis/run-tests-javascript.sh @@ -1,3 +1,3 @@ #!/bin/bash -mvn -Dparallel=methods -DthreadCount=4 -Dtest=node.* test +mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=node.* test diff --git a/.travis/run-tests-python2.sh b/.travis/run-tests-python2.sh index 355dabaa8..159c50613 100755 --- a/.travis/run-tests-python2.sh +++ b/.travis/run-tests-python2.sh @@ -1,3 +1,3 @@ #!/bin/bash -mvn -Dparallel=methods -DthreadCount=4 -Dtest=python2.* test +mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=python2.* test diff --git a/.travis/run-tests-python3.sh b/.travis/run-tests-python3.sh index d3e6f2e51..0aa363afe 100755 --- a/.travis/run-tests-python3.sh +++ b/.travis/run-tests-python3.sh @@ -1,3 +1,3 @@ #!/bin/bash -mvn -Dparallel=methods -DthreadCount=4 -Dtest=python3.* test +mvn -q -Dparallel=methods -DthreadCount=4 -Dtest=python3.* test diff --git a/.travis/run-tests-swift.sh b/.travis/run-tests-swift.sh index d4230eebc..78c38ba7f 100755 --- a/.travis/run-tests-swift.sh +++ b/.travis/run-tests-swift.sh @@ -1,4 +1,4 @@ #!/bin/bash # only test swift as we develop on os x so likely well tested and its dog slow on travis -mvn -Dtest=swift.* test +mvn -q -Dtest=swift.* test From 0cf3c2cf509f2d3b07eea55fe8807d4d48c8b9aa Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 02:44:07 +0800 Subject: [PATCH 09/12] divide and conquer --- .travis.yml | 10 ++++++---- .travis/before-install-linux-cpp.sh | 2 -- .travis/before-install-osx-cpp.sh | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9707fc9cc..71e9d9342 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,12 @@ matrix: include: - os: linux jdk: oraclejdk7 + env: + - TARGET=cpp + - CXX=g++-5 + - os: osx + compiler: clang + osx_image: xcode8.1 env: TARGET=cpp - os: linux jdk: oraclejdk7 @@ -34,10 +40,6 @@ matrix: compiler: clang osx_image: xcode8.1 env: TARGET=swift - - os: osx - compiler: clang - osx_image: xcode8.1 - env: TARGET=cpp before_install: - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh diff --git a/.travis/before-install-linux-cpp.sh b/.travis/before-install-linux-cpp.sh index 3ca500028..c5bf43614 100755 --- a/.travis/before-install-linux-cpp.sh +++ b/.travis/before-install-linux-cpp.sh @@ -6,5 +6,3 @@ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328 sudo add-apt-repository ppa:fkrull/deadsnakes -y sudo add-apt-repository ppa:rwky/nodejs -y sudo apt-get update -qq - -export CXX=g++-5 diff --git a/.travis/before-install-osx-cpp.sh b/.travis/before-install-osx-cpp.sh index 145a505c6..48152d221 100755 --- a/.travis/before-install-osx-cpp.sh +++ b/.travis/before-install-osx-cpp.sh @@ -5,6 +5,7 @@ set -euo pipefail thisdir=$(dirname "$0") brew update +brew install cmake # Work around apparent rvm bug that is in Travis's Xcode image. # https://github.com/direnv/direnv/issues/210 From 33401add2cf695dead0b3c0764df6dbee5240203 Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 02:47:48 +0800 Subject: [PATCH 10/12] divide and conquer --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71e9d9342..895655078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,10 @@ sudo: true language: java -compiler: clang - matrix: include: - os: linux + compiler: clang jdk: oraclejdk7 env: - TARGET=cpp From 069cf9354d3c332d041a43d4ac8a6651ef58622b Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 02:50:30 +0800 Subject: [PATCH 11/12] divide and conquer --- .travis.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 895655078..6a023e98f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,28 @@ matrix: env: - TARGET=cpp - CXX=g++-5 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - g++-5 + - uuid-dev + - clang-3.7 - os: osx compiler: clang osx_image: xcode8.1 env: TARGET=cpp + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - g++-5 + - uuid-dev + - clang-3.7 - os: linux jdk: oraclejdk7 env: TARGET=java @@ -47,12 +65,3 @@ script: - cd runtime-testsuite - ../.travis/run-tests-$TARGET.sh -addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - packages: - - g++-5 - - uuid-dev - - clang-3.7 From bd7df071f99790f842150be51d54623d1ffb87ff Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 28 Nov 2016 03:04:30 +0800 Subject: [PATCH 12/12] start with the slow builds --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a023e98f..bfff257b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,10 @@ matrix: - g++-5 - uuid-dev - clang-3.7 + - os: osx + compiler: clang + osx_image: xcode8.1 + env: TARGET=swift - os: linux jdk: oraclejdk7 env: TARGET=java @@ -53,10 +57,6 @@ matrix: - os: linux jdk: oraclejdk7 env: TARGET=go - - os: osx - compiler: clang - osx_image: xcode8.1 - env: TARGET=swift before_install: - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh