From 71c65c3eecbcfc0fc38c8468051825bb47cf6998 Mon Sep 17 00:00:00 2001 From: Yossi Itigin Date: Mon, 15 May 2017 10:48:26 +0300 Subject: [PATCH] JENKINS: Disable valgrind on ppc. --- contrib/test_jenkins.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/test_jenkins.sh b/contrib/test_jenkins.sh index fffc52d0a57..d30038e919c 100755 --- a/contrib/test_jenkins.sh +++ b/contrib/test_jenkins.sh @@ -441,13 +441,16 @@ run_gtest() { $AFFINITY $TIMEOUT make -C test/gtest test (cd test/gtest && rename .tap _gtest.tap *.tap && mv *.tap $GTEST_REPORT_DIR) - if ! [[ $(uname -m) =~ "aarch" ]] + if ! [[ $(uname -m) =~ "aarch" ]] && ! [[ $(uname -m) =~ "ppc" ]] then echo "==== Running valgrind tests ====" - if [ $(valgrind --version) != "valgrind-3.10.0" ] + + # Load newer valgrind if naative is older than 3.10 + if ! (echo "valgrind-3.10.0"; valgrind --version) | sort -CV then module load tools/valgrind-latest fi + export VALGRIND_EXTRA_ARGS="--xml=yes --xml-file=valgrind.xml --child-silent-after-fork=yes" $AFFINITY $TIMEOUT_VALGRIND make -C test/gtest test_valgrind (cd test/gtest && rename .tap _vg.tap *.tap && mv *.tap $GTEST_REPORT_DIR)