From 9c415cbf09c6bb3af225d6461cb283ea8a44d64f Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Fri, 15 Aug 2014 15:29:53 -0600 Subject: [PATCH] disable irrelevant openjdk target when openjdk is passed as a flag --- test/ci.sh | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/test/ci.sh b/test/ci.sh index 90d0ebfb18..18d3695b55 100755 --- a/test/ci.sh +++ b/test/ci.sh @@ -23,14 +23,32 @@ run_cmake() { cd .. } +flags="${@}" + +run_if_not_covered() { + local arg=$1 + shift + + for f in ${flags}; do + local key=$(echo $f | awk -F '=' '{print $1}') + if [ ${key} = ${arg} ]; then + return + fi + done + + run "${@}" +} + run_cmake -DCMAKE_BUILD_TYPE=Debug run make jdk-test -run make ${@} test -run make ${@} mode=debug test -run make ${@} process=interpret test -run make ${@} bootimage=true test -run make ${@} mode=debug bootimage=true test -run make ${@} openjdk=$JAVA_HOME test -run make ${@} tails=true continuations=true heapdump=true test -run make ${@} codegen-targets=all +run make ${flags} test +run make ${flags} mode=debug test +run make ${flags} process=interpret test +run make ${flags} bootimage=true test +run make ${flags} mode=debug bootimage=true test + +run_if_not_covered openjdk make ${flags} openjdk=$JAVA_HOME test + +run make ${flags} tails=true continuations=true heapdump=true test +run make ${flags} codegen-targets=all