From dda21dfcaf557e8f1ac47a8b8c3efe72f2bb7983 Mon Sep 17 00:00:00 2001 From: degomme Date: Tue, 5 Jul 2016 11:01:38 +0200 Subject: [PATCH] as MC is mutually exclusive with NS3, move the test from coverage to flags. --- tools/jenkins/Flags.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh index b5acd374c5..c2d1caaa1e 100755 --- a/tools/jenkins/Flags.sh +++ b/tools/jenkins/Flags.sh @@ -17,6 +17,15 @@ do_cleanup() { done } +# Get an ON/OFF string from a command: +onoff() { + if "$@" > /dev/null ; then + echo ON + else + echo OFF + fi +} + ### Cleanup previous runs ! [ -z "$WORKSPACE" ] || die "No WORKSPACE" @@ -46,7 +55,8 @@ do -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \ -Denable_jedule=ON -Denable_mallocators=ON -Denable_debug=${builddebug} \ -Denable_smpi=${buildsmpi} -Denable_smpi_MPICH3_testsuite=${buildsmpi} -Denable_model-checking=${buildmc} \ - -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=OFF -Denable_coverage=OFF $WORKSPACE + -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=OFF + -Denable_ns3=$(onoff test "$buildmc" != "ON") -Denable_coverage=OFF $WORKSPACE make -j$NUMPROC make clean done -- 2.20.1