walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Correct valgrind settings for JIT regression testing; more minor selector 

tweaks.
This commit is contained in:
Philip.Hazel 2016-06-29 16:43:02 +00:00
parent acc29ed05a
commit 7bb2dab59a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maint/ManyConfigTests
View File

@ -79,7 +79,7 @@ while [ $# -gt 0 ] ; do
+main) usemain=1; usemainvalgrind=1;; +main) usemain=1; usemainvalgrind=1;;
+mainvalgrind) usemainvalgrind=1;; +mainvalgrind) usemainvalgrind=1;;
+tmp) usetmp=1;; +tmp) usetmp=1;;
+valgrind) usevalgrind=1;; +valgrind) usevalgrind=1; usejitvalgrind=1; usemainvalgrind=1;;
*) echo "Unknown option '$1'"; exit 1;; *) echo "Unknown option '$1'"; exit 1;;
esac esac
shift shift
@ -223,7 +223,7 @@ runtest()
if [ "$jit" -gt 0 ]; then if [ "$jit" -gt 0 ]; then
echo "Running JIT regression tests $withvalgrind" 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 if [ $? -ne 0 -o -s teststderrM ]; then
echo " " echo " "
echo "**** Test failed ****" echo "**** Test failed ****"
@ -257,7 +257,7 @@ if [ $testtotal -eq 0 ] ; then
fi fi
valgrind= valgrind=
cvalgrind= jrvalgrind=
withvalgrind= withvalgrind=
srcdir=. srcdir=.
export srcdir export srcdir
@ -374,7 +374,6 @@ fi
if [ $usevalgrind -ne 0 ]; then if [ $usevalgrind -ne 0 ]; then
echo "---------- Tests in the current directory using valgrind ----------" echo "---------- Tests in the current directory using valgrind ----------"
valgrind=valgrind valgrind=valgrind
cvalgrind="valgrind -q --smc-check=all"
withvalgrind="with valgrind" withvalgrind="with valgrind"
if [ $usemainvalgrind -ne 0 ]; then if [ $usemainvalgrind -ne 0 ]; then
@ -389,6 +388,7 @@ if [ $usevalgrind -ne 0 ]; then
fi fi
if [ $usejitvalgrind -ne 0 ]; then if [ $usejitvalgrind -ne 0 ]; then
jrvalgrind="valgrind --tool=memcheck -q --smc-check=all-non-file --suppressions=$srcdir/testdata/valgrind-jit.supp"
for opts in \ for opts in \
"--enable-jit --disable-shared" \ "--enable-jit --disable-shared" \
"--enable-jit --enable-pcre2-16 --enable-pcre2-32" "--enable-jit --enable-pcre2-16 --enable-pcre2-32"
@ -400,7 +400,7 @@ if [ $usevalgrind -ne 0 ]; then
fi fi
valgrind= valgrind=
cvalgrind= jrvalgrind=
withvalgrind= withvalgrind=
# Clean up the distribution and then do at least one build and test in a # Clean up the distribution and then do at least one build and test in a