From e25878b20fa2d390110be1fb01dc8cb9ba570f66 Mon Sep 17 00:00:00 2001 From: ph10 Date: Wed, 29 Jun 2016 16:43:02 +0000 Subject: [PATCH] Correct valgrind settings for JIT regression testing; more minor selector tweaks. --- maint/ManyConfigTests | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maint/ManyConfigTests b/maint/ManyConfigTests index 0156968..319631a 100755 --- a/maint/ManyConfigTests +++ b/maint/ManyConfigTests @@ -79,7 +79,7 @@ while [ $# -gt 0 ] ; do +main) usemain=1; usemainvalgrind=1;; +mainvalgrind) usemainvalgrind=1;; +tmp) usetmp=1;; - +valgrind) usevalgrind=1;; + +valgrind) usevalgrind=1; usejitvalgrind=1; usemainvalgrind=1;; *) echo "Unknown option '$1'"; exit 1;; esac shift @@ -223,7 +223,7 @@ runtest() if [ "$jit" -gt 0 ]; then echo "Running JIT regression tests $withvalgrind" - $cvalgrind $srcdir/pcre2_jit_test >teststdoutM 2>teststderrM + $jrvalgrind $srcdir/pcre2_jit_test >teststdoutM 2>teststderrM if [ $? -ne 0 -o -s teststderrM ]; then echo " " echo "**** Test failed ****" @@ -257,7 +257,7 @@ if [ $testtotal -eq 0 ] ; then fi valgrind= -cvalgrind= +jrvalgrind= withvalgrind= srcdir=. export srcdir @@ -374,7 +374,6 @@ fi if [ $usevalgrind -ne 0 ]; then echo "---------- Tests in the current directory using valgrind ----------" valgrind=valgrind - cvalgrind="valgrind -q --smc-check=all" withvalgrind="with valgrind" if [ $usemainvalgrind -ne 0 ]; then @@ -389,6 +388,7 @@ if [ $usevalgrind -ne 0 ]; then fi if [ $usejitvalgrind -ne 0 ]; then + jrvalgrind="valgrind --tool=memcheck -q --smc-check=all-non-file --suppressions=$srcdir/testdata/valgrind-jit.supp" for opts in \ "--enable-jit --disable-shared" \ "--enable-jit --enable-pcre2-16 --enable-pcre2-32" @@ -400,7 +400,7 @@ if [ $usevalgrind -ne 0 ]; then fi valgrind= -cvalgrind= +jrvalgrind= withvalgrind= # Clean up the distribution and then do at least one build and test in a