Merge branch 'master' into user/niwilson/zos

Author: NWilson

.gitignore

@@ -77,9 +77,19 @@ testtry
 testtry2
 testtrygrep
 testSinput
+testSoutput
 testbtables
 testsaved1
 testsaved2
+testoutput8
+testoutput8-jit
+testoutput8-dfa
+testoutput16
+testoutput16-jit
+testoutput16-dfa
+testoutput32
+testoutput32-jit
+testoutput32-dfa
 
 m4/libtool.m4
 m4/ltoptions.m4

Makefile.am

@@ -841,6 +841,7 @@ EXTRA_DIST += \
 
 CLEANFILES += \
         testSinput \
+        testSoutput \
         test3input \
         test3output \
         test3outputA \
@@ -854,6 +855,13 @@ CLEANFILES += \
         testtrygrep \
         testNinputgrep
 
+clean-local: testoutput-clean
+.PHONY: testoutput-clean
+testoutput-clean:
+	-rm -rf testoutput8 testoutput8-jit testoutput8-dfa
+	-rm -rf testoutput16 testoutput16-jit testoutput16-dfa
+	-rm -rf testoutput32 testoutput32-jit testoutput32-dfa
+
 ## ------------ End of testing -------------
 
 

README

@@ -637,9 +637,9 @@ NON-AUTOTOOLS-BUILD.
 The RunTest script runs the pcre2test test program (which is documented in its
 own man page) on each of the relevant testinput files in the testdata
 directory, and compares the output with the contents of the corresponding
-testoutput files. RunTest uses a file called testtry to hold the main output
-from pcre2test. Other files whose names begin with "test" are used as working
-files in some tests.
+testoutput files. RunTest places its output in directories
+testoutput{8,16,32}{,-jit,-dfa}. Other files whose names begin with "test" are
+used as working files in some tests.
 
 Some tests are relevant only when certain build-time options were selected. For
 example, the tests for UTF-8/16/32 features are run only when Unicode support