Chip away at more coverage gaps (#799)

Author: NWilson

RunTest

@@ -197,8 +197,9 @@ checkresult()
 
 checkspecial()
   {
+  expect=${2:-0}
   $sim $valgrind $vjs $pcre2test $1 >>testSoutput
-  if [ $? -ne 0 ] ; then
+  if [ $? -ne "$expect" ] ; then
     echo "** pcre2test $1 failed - check testSoutput"
     yield=1
     return 1
@@ -538,16 +539,23 @@ for bmode in "$test8" "$test16" "$test32"; do
     echo '   abc' >>testSinput
     echo '' >testSoutput
     saverc=0
-    checkspecial '-C' || saverc=$?
+    checkspecial "$bmode -C" || saverc=$?
     checkspecial '--help' || saverc=$?
     checkspecial "$bmode testSinput" || saverc=$?
     checkspecial "$bmode $testdata/testinputheap" || saverc=$?
     if [ $support_setstack -eq 0 ] ; then
       checkspecial "$bmode -S 1 -t 10 testSinput" || saverc=$?
     fi
+    checkspecial "$bmode reallydoesnotexist" 1 || saverc=$?
+    checkspecial "$bmode testSinput reallydoesnotexist/outfile" 1 || saverc=$?
+    checkspecial "$bmode -pattern debug testSinput" || saverc=$?
+    checkspecial "$bmode -pattern INVALID testSinput" 1 2>/dev/null || saverc=$?
+    checkspecial "$bmode -subject notempty testSinput" || saverc=$?
+    checkspecial "$bmode -subject INVALID testSinput" 1 2>/dev/null || saverc=$?
     checkspecial -LM || saverc=$?
     checkspecial -LP || saverc=$?
     checkspecial -LS || saverc=$?
+    checkspecial "$bmode -unittest" || saverc=$?
     if [ $saverc -eq 0 ] ; then
       echo "  OK"
     fi

doc/html/pcre2_substring_length_byname.html

@@ -31,9 +31,11 @@ <h2>
 <pre>
   <i>match_data</i>   The match data block for the match
   <i>name</i>         The substring name
-  <i>length</i>       Where to return the length
+  <i>length</i>       Where to return the length, or NULL
 </pre>
-The yield is zero on success, or an error code if the substring is not found.
+The third argument may be NULL if all you want to know is whether or not a
+substring is set. The yield is zero on success, or a negative error code
+otherwise.
 </p>
 <p>
 There is a complete description of the PCRE2 native API in the

doc/html/pcre2test.html

@@ -282,6 +282,12 @@ <h2><a name="SEC4" href="#TOC1">COMMAND LINE OPTIONS</a></h2>
 -C and any -Lx options are present, whichever is first is recognized.
 </p>
 <p>
+<b>-malloc</b>
+Exercise malloc() failures, by first counting the number of calls made to malloc
+during pattern compilation and matching, then re-running the compilation and
+matching that many times, exercising a failure of each malloc() call.
+</p>
+<p>
 <b>-pattern</b> <i>modifier-list</i>
 Behave as if each pattern line contains the given modifiers.
 </p>
@@ -318,10 +324,9 @@ <h2><a name="SEC4" href="#TOC1">COMMAND LINE OPTIONS</a></h2>
 the total times for all compiles and matches are output.
 </p>
 <p>
-<b>-malloc</b>
-Exercise malloc() failures, by first counting the number of calls made to malloc
-during pattern compilation and matching, then re-running the compilation and
-matching that many times, exercising a failure of each malloc() call.
+<b>-unittest</b>
+Run a fixed set of additional tests of the PCRE2 API which are not driven by
+the test input files, and then exit.
 </p>
 <p>
 <b>-version</b>

doc/pcre2_substring_length_byname.3

@@ -19,9 +19,11 @@ The arguments are:
 .sp
   \fImatch_data\fP   The match data block for the match
   \fIname\fP         The substring name
-  \fIlength\fP       Where to return the length
+  \fIlength\fP       Where to return the length, or NULL
 .sp
-The yield is zero on success, or an error code if the substring is not found.
+The third argument may be NULL if all you want to know is whether or not a
+substring is set. The yield is zero on success, or a negative error code
+otherwise.
 .P
 There is a complete description of the PCRE2 native API in the
 .\" HREF

doc/pcre2test.1

@@ -236,6 +236,11 @@ List scripts: write a list of recognized Unicode script names to the standard
 output, then exit with zero exit code. All other options are ignored. If both
 -C and any -Lx options are present, whichever is first is recognized.
 .TP 10
+\fB-malloc\fP
+Exercise malloc() failures, by first counting the number of calls made to malloc
+during pattern compilation and matching, then re-running the compilation and
+matching that many times, exercising a failure of each malloc() call.
+.TP 10
 \fB-pattern\fP \fImodifier-list\fP
 Behave as if each pattern line contains the given modifiers.
 .TP 10
@@ -265,10 +270,9 @@ compile phase.
 These behave like \fB-t\fP and \fB-tm\fP, but in addition, at the end of a run,
 the total times for all compiles and matches are output.
 .TP 10
-\fB-malloc\fP
-Exercise malloc() failures, by first counting the number of calls made to malloc
-during pattern compilation and matching, then re-running the compilation and
-matching that many times, exercising a failure of each malloc() call.
+\fB-unittest\fP
+Run a fixed set of additional tests of the PCRE2 API which are not driven by
+the test input files, and then exit.
 .TP 10
 \fB-version\fP
 Output the PCRE2 version number and then exit.