From 94bd876f3578a5c449991aae2204dd9e242d8bb4 Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Tue, 29 Apr 2014 14:15:00 -0700 Subject: [PATCH] ci.sh: control which target is run for each of the configurations There are two important things here: * We only want to run "jdk-test" if we were running "test" for everything else. This gets around a bug where jdk-test fails for cross-compile builds (where JNI is involved) * We can specify a different test target by setting the "test" environment variable. This is useful for cross-compiling the tests in a docker image (setting the test_target to "build-test") --- test/ci.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/test/ci.sh b/test/ci.sh index 28d049af64..d96e2e5c50 100755 --- a/test/ci.sh +++ b/test/ci.sh @@ -2,13 +2,21 @@ set -e -make ${flags} jdk-test -make ${flags} test -make ${flags} mode=debug test -make ${flags} process=interpret test +if [ -z "${test_target}" ]; then + test_target=test +fi + +# we shouldn't run jdk-test builds if we're not running the test target +if [ ${test_target} = test ]; then + make ${flags} jdk-test +fi + +make ${flags} ${test_target} +make ${flags} mode=debug ${test_target} +make ${flags} process=interpret ${test_target} # bootimage and openjdk builds without openjdk-src don't work: if [ -z "${openjdk}" ]; then - make ${flags} bootimage=true test + make ${flags} bootimage=true ${test_target} fi -make ${flags} tails=true continuations=true test +make ${flags} tails=true continuations=true ${test_target} make ${flags} codegen-targets=all