summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2018-12-06 17:13:41 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2018-12-06 17:13:41 +0000
commit2539aa2069e7d1caffc886da77525a501f3b3860 (patch)
tree16441415919c3ddab9f67a9cf7aa06f9803db06f
parent131a8d88dae73334b52e9c491e5dd772bc91c9d8 (diff)
downloadpcre2-2539aa2069e7d1caffc886da77525a501f3b3860.tar.gz
Redirect stderr in RunGrepTest instead of appending to testtrygrep from two
different file descriptors, because the latter doesn't always work as expected. git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1051 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--ChangeLog4
-rwxr-xr-xRunGrepTest6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 49139e1..3115164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,10 @@ Solaris and MacOS as printf and sed can't handle them. It seems that the *BSD
systems can't either. I've inverted the test so that only those OS that are
known to work (currently only Linux) try to run this test.
+24. Some tests in RunGrepTest appended to testtrygrep from two different file
+descriptors instead of redirecting stderr to stdout. This worked on Linux, but
+it was reported not to on other systems, causing the tests to fail.
+
Version 10.32 10-September-2018
-------------------------------
diff --git a/RunGrepTest b/RunGrepTest
index b950927..378bba2 100755
--- a/RunGrepTest
+++ b/RunGrepTest
@@ -170,11 +170,11 @@ echo "---------------------------- Test 14 -----------------------------" >>test
echo "RC=$?" >>testtrygrep
echo "---------------------------- Test 15 -----------------------------" >>testtrygrep
-(cd $srcdir; $valgrind $vjs $pcre2grep 'abc^*' ./testdata/grepinput) 2>>testtrygrep >>testtrygrep
+(cd $srcdir; $valgrind $vjs $pcre2grep 'abc^*' ./testdata/grepinput) >>testtrygrep 2>&1
echo "RC=$?" >>testtrygrep
echo "---------------------------- Test 16 -----------------------------" >>testtrygrep
-(cd $srcdir; $valgrind $vjs $pcre2grep abc ./testdata/grepinput ./testdata/nonexistfile) 2>>testtrygrep >>testtrygrep
+(cd $srcdir; $valgrind $vjs $pcre2grep abc ./testdata/grepinput ./testdata/nonexistfile) >>testtrygrep 2>&1
echo "RC=$?" >>testtrygrep
echo "---------------------------- Test 17 -----------------------------" >>testtrygrep
@@ -296,7 +296,7 @@ echo "---------------------------- Test 45 ------------------------------" >>tes
echo "RC=$?" >>testtrygrep
echo "---------------------------- Test 46 ------------------------------" >>testtrygrep
-(cd $srcdir; $valgrind $vjs $pcre2grep -eabc -e '(unclosed' ./testdata/grepinput) 2>>testtrygrep >>testtrygrep
+(cd $srcdir; $valgrind $vjs $pcre2grep -eabc -e '(unclosed' ./testdata/grepinput) >>testtrygrep 2>&1
echo "RC=$?" >>testtrygrep
echo "---------------------------- Test 47 ------------------------------" >>testtrygrep