diff options
author | Nobuaki Sukegawa <nsuke@apache.org> | 2016-09-04 15:33:40 +0900 |
---|---|---|
committer | Nobuaki Sukegawa <nsuke@apache.org> | 2016-09-04 21:13:40 +0900 |
commit | 2c64bddc0085de94b01d00bc0e98615562f631d7 (patch) | |
tree | fffd8ba394a753a974d749009ae968b32fae4e8a | |
parent | 93fb7eadd093e561e3c7122dc9eb084ca033047d (diff) | |
download | thrift-2c64bddc0085de94b01d00bc0e98615562f631d7.tar.gz |
THRIFT-3918 Run subset of make cross
This closes #1079
-rw-r--r-- | .travis.yml | 20 | ||||
-rwxr-xr-x | Makefile.am | 11 | ||||
-rwxr-xr-x | build/docker/scripts/cross-test.sh | 2 |
3 files changed, 23 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index fc5f95331..81a88c3ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,15 +42,25 @@ env: - BUILD_LIBS="CPP C_GLIB HASKELL JAVA PYTHON TESTING TUTORIALS" # only meaningful for CMake builds matrix: - # TODO: Break up by protocol types to avoid 50min limit - - TEST_NAME="Cross Language Tests" + - TEST_NAME="Cross Language Tests (Binary and Header Protocols)" SCRIPT="cross-test.sh" - BUILD_ARG="--enable-tutorial=no" + BUILD_ARG="-'(binary|header)'" BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4" - - TEST_NAME="Cross Language Tests (Debian)" + - TEST_NAME="Cross Language Tests (Debian) (Binary and Header Protocols)" SCRIPT="cross-test.sh" - BUILD_ARG="--enable-tutorial=no" + BUILD_ARG="-'(binary|header)'" + BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4" + DISTRO=debian + + - TEST_NAME="Cross Language Tests (Compact and JSON Protocols)" + SCRIPT="cross-test.sh" + BUILD_ARG="-'(compact|json)'" + BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4" + + - TEST_NAME="Cross Language Tests (Debian) (Compact and JSON Protocols)" + SCRIPT="cross-test.sh" + BUILD_ARG="-'(compact|json)'" BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4" DISTRO=debian diff --git a/Makefile.am b/Makefile.am index 10fe49a6c..38dd8c9d6 100755 --- a/Makefile.am +++ b/Makefile.am @@ -56,15 +56,18 @@ CROSS_PY=$(PYTHON) endif if WITH_PYTHON -cross: precross +crossfeature: precross $(CROSS_PY) test/test.py --retry-count 3 --features .* --skip-known-failures --server $(CROSS_LANGS_COMMA_SEPARATED) - $(CROSS_PY) test/test.py --retry-count 3 --skip-known-failures --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED) else # feature test needs python build -cross: precross - $(CROSS_PY) test/test.py -s --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED) +crossfeature: endif +cross-%: precross crossfeature + $(CROSS_PY) test/test.py --retry-count 3 --skip-known-failures --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED) --regex "$*" + +cross: cross-.* + TIMES = 1 2 3 fail: precross $(CROSS_PY) test/test.py || true diff --git a/build/docker/scripts/cross-test.sh b/build/docker/scripts/cross-test.sh index 4da78139e..43581a5f3 100755 --- a/build/docker/scripts/cross-test.sh +++ b/build/docker/scripts/cross-test.sh @@ -6,7 +6,7 @@ set -ev make -j3 precross set +e -make cross +make cross$1 RET=$? if [ $RET -ne 0 ]; then |