diff options
author | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2015-09-08 17:01:17 +0000 |
---|---|---|
committer | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2015-09-08 17:01:17 +0000 |
commit | 53d249835154cf0b9872965b8600a6f2a779e68e (patch) | |
tree | 739fc83d9ead1cc01450d4bf31f47ae7e9bfcd21 /maint/ManyConfigTests | |
parent | 2801ae6e160677c359c60fd90299b785765d7980 (diff) | |
download | pcre2-53d249835154cf0b9872965b8600a6f2a779e68e.tar.gz |
Implement #newline_default and adjust testdata and scripts to use it.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@365 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'maint/ManyConfigTests')
-rwxr-xr-x | maint/ManyConfigTests | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/maint/ManyConfigTests b/maint/ManyConfigTests index 1830baa..a0401e1 100755 --- a/maint/ManyConfigTests +++ b/maint/ManyConfigTests @@ -131,33 +131,22 @@ runtest() ./pcre2test -C fi - nl=`./pcre2test -C newline` - if [ "$nl" = "LF" -o "$nl" = "ANY" -o "$nl" = "ANYCRLF" ]; then - nlok=1 - else - nlok=0 - fi - ./pcre2test -C jit >/dev/null jit=$? ./pcre2test -C pcre2-8 >/dev/null pcre2_8=$? - if [ $nlok -gt 0 ]; then - echo "Running PCRE2 library tests $withvalgrind" - $srcdir/RunTest $valgrind >teststdout 2>teststderr - if [ $? -ne 0 -o -s teststderr ]; then - echo " " - echo "**** Test failed ****" - cat teststderr - if [ -s teststdout ] ; then cat teststdout; fi - exit 1 - fi - else - echo "Skipping PCRE2 library tests: newline is $nl" + echo "Running PCRE2 library tests $withvalgrind" + $srcdir/RunTest $valgrind >teststdout 2>teststderr + if [ $? -ne 0 -o -s teststderr ]; then + echo " " + echo "**** Test failed ****" + cat teststderr + if [ -s teststdout ] ; then cat teststdout; fi + exit 1 fi - if [ $nlok -gt 0 -a $pcre2_8 -gt 0 ]; then + if [ $pcre2_8 -gt 0 ]; then echo "Running pcre2grep tests $withvalgrind" $srcdir/RunGrepTest $valgrind >teststdout 2>teststderr if [ $? -ne 0 -o -s teststderr ]; then @@ -167,10 +156,8 @@ runtest() cat teststdout exit 1 fi - elif [ $nlok -gt 0 ]; then - echo "Skipping pcre2grep tests: 8-bit library not compiled" else - echo "Skipping pcre2grep tests: newline is $nl" + echo "Skipping pcre2grep tests: 8-bit library not compiled" fi if [ "$jit" -gt 0 ]; then |