--- embedaddon/pcre/RunTest	2012/02/21 23:50:25	1.1.1.2
+++ embedaddon/pcre/RunTest	2013/07/22 08:25:55	1.1.1.4
@@ -1,8 +1,9 @@
 #! /bin/sh
 
+###############################################################################
 # Run the PCRE tests using the pcretest program. The appropriate tests are
 # selected, depending on which build-time options were used.
-
+#
 # All tests are now run both with and without -s, to ensure that everything is
 # tested with and without studying. However, there are some tests that produce
 # different output after studying, typically when we are tracing the actual
@@ -12,31 +13,168 @@
 # any difference to their output. There is also one test which compiles invalid
 # UTF-8 with the UTF-8 check turned off; for this, studying must also be
 # disabled with /SS.
-
+#
 # When JIT support is available, all the tests are also run with -s+ to test
-# (again, almost) everything with studying and the JIT option. There are also
-# two tests for JIT-specific features, one to be run when JIT support is
-# available, and one when it is not.
+# (again, almost) everything with studying and the JIT option, unless "nojit"
+# is given on the command line. There are also two tests for JIT-specific
+# features, one to be run when JIT support is available (unless "nojit" is
+# specified), and one when it is not.
+#
+# Whichever of the 8-, 16- and 32-bit libraries exist are tested. It is also
+# possible to select which to test by giving "-8", "-16" or "-32" on the
+# command line.
+#
+# As well as "nojit", "-8", "-16", and "-32", arguments for this script are
+# individual test numbers, ranges of tests such as 3-6 or 3- (meaning 3 to the
+# end), or a number preceded by ~ to exclude a test. For example, "3-15 ~10"
+# runs tests 3 to 15, excluding test 10, and just "~10" runs all the tests
+# except test 10. Whatever order the arguments are in, the tests are always run
+# in numerical order.
 
-# Whichever of the 8-bit and 16-bit libraries exist are tested. It is also
-# possible to select which to test by the arguments -8 or -16.
-
-# Other arguments for this script can be individual test numbers, or the word
-# "valgrind", or "sim" followed by an argument to run cross-compiled
-# executables under a simulator, for example:
+# Other arguments can be one of the words "valgrind", "valgrind-log", or "sim"
+# followed by an argument to run cross- compiled executables under a simulator,
+# for example:
 #
 # RunTest 3 sim "qemu-arm -s 8388608"
+#
+# There are two special cases where only one argument is allowed:
+#
+# If the first and only argument is "ebcdic", the script runs the special
+# EBCDIC test that can be useful for checking certain EBCDIC features, even
+# when run in an ASCII environment.
+#
+# If the script is obeyed as "RunTest list", a list of available tests is
+# output, but none of them are run.
+###############################################################################
 
-valgrind=
-sim=
+# Define test titles in variables so that they can be output as a list. Some
+# of them are modified (e.g. with -8 or -16) when used in the actual tests.
+
+title1="Test 1: Main functionality (Compatible with Perl >= 5.10)"
+title2="Test 2: API, errors, internals, and non-Perl stuff"
+title3="Test 3: Locale-specific features"
+title4A="Test 4: UTF"
+title4B=" support (Compatible with Perl >= 5.10)"
+title5="Test 5: API, internals, and non-Perl stuff for UTF"
+title6="Test 6: Unicode property support (Compatible with Perl >= 5.10)"
+title7="Test 7: API, internals, and non-Perl stuff for Unicode property support"
+title8="Test 8: DFA matching main functionality"
+title9="Test 9: DFA matching with UTF"
+title10="Test 10: DFA matching with Unicode properties"
+title11="Test 11: Internal offsets and code size tests"
+title12="Test 12: JIT-specific features (JIT available)"
+title13="Test 13: JIT-specific features (JIT not available)"
+title14="Test 14: Specials for the basic 8-bit library"
+title15="Test 15: Specials for the 8-bit library with UTF-8 support"
+title16="Test 16: Specials for the 8-bit library with Unicode propery support"
+title17="Test 17: Specials for the basic 16/32-bit library"
+title18="Test 18: Specials for the 16/32-bit library with UTF-16/32 support"
+title19="Test 19: Specials for the 16/32-bit library with Unicode property support"
+title20="Test 20: DFA specials for the basic 16/32-bit library"
+title21="Test 21: Reloads for the basic 16/32-bit library"
+title22="Test 22: Reloads for the 16/32-bit library with UTF-16/32 support"
+title23="Test 23: Specials for the 16-bit library"
+title24="Test 24: Specials for the 16-bit library with UTF-16 support"
+title25="Test 25: Specials for the 32-bit library"
+title26="Test 26: Specials for the 32-bit library with UTF-32 support"
+
+maxtest=26
+
+if [ $# -eq 1 -a "$1" = "list" ]; then
+  echo $title1
+  echo $title2 "(not UTF)"
+  echo $title3
+  echo $title4A $title4B
+  echo $title5 support
+  echo $title6
+  echo $title7
+  echo $title8
+  echo $title9
+  echo $title10
+  echo $title11
+  echo $title12
+  echo $title13
+  echo $title14
+  echo $title15
+  echo $title16
+  echo $title17
+  echo $title18
+  echo $title19
+  echo $title20
+  echo $title21
+  echo $title22
+  echo $title23
+  echo $title24
+  echo $title25
+  echo $title26
+  exit 0
+fi
+
+# Set up a suitable "diff" command for comparison. Some systems
+# have a diff that lacks a -u option. Try to deal with this.
+
+cf="diff"
+diff -u /dev/null /dev/null 2>/dev/null && cf="diff -u"
+
+# Find the test data
+
+if [ -n "$srcdir" -a -d "$srcdir" ] ; then
+  testdata="$srcdir/testdata"
+elif [ -d "./testdata" ] ; then
+  testdata=./testdata
+elif [ -d "../testdata" ] ; then
+  testdata=../testdata
+else
+  echo "Cannot find the testdata directory"
+  exit 1
+fi
+
+
+# ------ Special EBCDIC Test -------
+
+if [ $# -eq 1 -a "$1" = "ebcdic" ]; then
+  ./pcretest -C ebcdic >/dev/null
+  ebcdic=$?
+  if [ $ebcdic -ne 1 ] ; then
+    echo "Cannot run EBCDIC tests: EBCDIC support not compiled"
+    exit 1
+  fi
+
+  for opt in "" "-s" "-dfa" "-s -dfa"; do
+    ./pcretest -q $opt $testdata/testinputEBC >testtry
+    if [ $? = 0 ] ; then
+      $cf $testdata/testoutputEBC testtry
+      if [ $? != 0 ] ; then exit 1; fi
+    else exit 1
+    fi
+    if [ "$opt" = "-s" ] ; then echo "  OK with study"
+    elif [ "$opt" = "-dfa" ] ; then echo "  OK using DFA"
+    elif [ "$opt" = "-s -dfa" ] ; then echo "  OK using DFA with study"
+    else echo "  OK"
+    fi
+  done
+
+exit 0
+fi
+
+
+# ------ Normal Tests ------
+
+# Default values
+
 arg8=
 arg16=
+arg32=
+nojit=
+sim=
+skip=
+valgrind=
 
 # This is in case the caller has set aliases (as I do - PH)
 unset cp ls mv rm
 
-# Select which tests to run; for those that are explicitly requested, check
-# that the necessary optional facilities are available.
+# Process options and select which tests to run; for those that are explicitly
+# requested, check that the necessary optional facilities are available.
 
 do1=no
 do2=no
@@ -60,6 +198,10 @@ do19=no
 do20=no
 do21=no
 do22=no
+do23=no
+do24=no
+do25=no
+do26=no
 
 while [ $# -gt 0 ] ; do
   case $1 in
@@ -85,38 +227,47 @@ while [ $# -gt 0 ] ; do
    20) do20=yes;;
    21) do21=yes;;
    22) do22=yes;;
+   23) do23=yes;;
+   24) do24=yes;;
+   25) do25=yes;;
+   26) do26=yes;;
    -8) arg8=yes;;
   -16) arg16=yes;;
-   valgrind) valgrind="valgrind -q --smc-check=all";;
+  -32) arg32=yes;;
+   nojit) nojit=yes;;
    sim) shift; sim=$1;;
-    *) echo "Unknown test number $1"; exit 1;;
+   valgrind) valgrind="valgrind --tool=memcheck -q --smc-check=all";;
+   valgrind-log) valgrind="valgrind --tool=memcheck --num-callers=30 --leak-check=no --error-limit=no --smc-check=all --log-file=report.%p ";;
+   ~*)
+     if expr "$1" : '~[0-9][0-9]*$' >/dev/null; then
+       skip="$skip `expr "$1" : '~\([0-9]*\)*$'`"
+     else
+       echo "Unknown option or test selector '$1'"; exit 1
+     fi
+   ;;
+   *-*)
+     if expr "$1" : '[0-9][0-9]*-[0-9]*$' >/dev/null; then
+       tf=`expr "$1" : '\([0-9]*\)'`
+       tt=`expr "$1" : '.*-\([0-9]*\)'`
+       if [ "$tt" = "" ] ; then tt=$maxtest; fi
+       if expr \( "$tf" "<" 1 \) \| \( "$tt" ">" "$maxtest" \) >/dev/null; then
+         echo "Invalid test range '$1'"; exit 1
+       fi
+       while expr "$tf" "<=" "$tt" >/dev/null; do
+         eval do${tf}=yes
+         tf=`expr $tf + 1`
+       done
+     else
+       echo "Invalid test range '$1'"; exit 1
+     fi
+   ;;
+   *) echo "Unknown option or test selector '$1'"; exit 1;;
   esac
   shift
 done
 
-# Set up a suitable "diff" command for comparison. Some systems
-# have a diff that lacks a -u option. Try to deal with this.
+# Find which optional facilities are available.
 
-if diff -u /dev/null /dev/null; then cf="diff -u"; else cf="diff"; fi
-
-# Find the test data
-
-if [ -n "$srcdir" -a -d "$srcdir" ] ; then
-  testdata="$srcdir/testdata"
-elif [ -d "./testdata" ] ; then
-  testdata=./testdata
-elif [ -d "../testdata" ] ; then
-  testdata=../testdata
-else
-  echo "Cannot find the testdata directory"
-  exit 1
-fi
-
-# Find which optional facilities are available. In some Windows environments
-# the output of pcretest -C has CRLF at the end of each line, but the shell
-# strips only linefeeds from the output of a `backquoted` command. Hence the
-# alternative patterns.
-
 $sim ./pcretest -C linksize >/dev/null
 link_size=$?
 if [ $link_size -lt 2 ] ; then
@@ -128,41 +279,62 @@ if [ $link_size -gt 4 ] ; then
   exit 1
 fi
 
-# Both 8-bit and 16-bit character strings may be supported, but only one
-# need be.
+# All of 8-bit, 16-bit, and 32-bit character strings may be supported, but only
+# one need be.
 
 $sim ./pcretest -C pcre8 >/dev/null
 support8=$?
 $sim ./pcretest -C pcre16 >/dev/null
 support16=$?
-if [ $(( $support8 + $support16 )) -eq 2 ] ; then
-  test8=
-  test16=-16
-  if [ "$arg8" = yes -a "$arg16" != yes ] ; then
-    test16=skip
+$sim ./pcretest -C pcre32 >/dev/null
+support32=$?
+
+# Initialize all bitsizes skipped
+
+test8=skip
+test16=skip
+test32=skip
+
+# If no bitsize arguments, select all that are available
+
+if [ "$arg8$arg16$arg32" = "" ] ; then
+  if [ $support8 -ne 0 ] ; then
+    test8=
   fi
-  if [ "$arg16" = yes -a "$arg8" != yes ] ; then
-    test8=skip
+  if [ $support16 -ne 0 ] ; then
+    test16=-16
   fi
+  if [ $support32 -ne 0 ] ; then
+    test32=-32
+  fi
+
+# Select requested bit sizes
+
 else
-  if [ $support8 -ne 0 ] ; then
-    if [ "$arg16" = yes ] ; then
-      echo "Cannot run 16-bit library tests: 16-bit library not compiled"
+  if [ "$arg8" = yes ] ; then
+    if [ $support8 -eq 0 ] ; then
+      echo "Cannot run 8-bit library tests: 8-bit library not compiled"
       exit 1
     fi
     test8=
-    test16=skip
-  else
-    if [ "$arg8" = yes ] ; then
-      echo "Cannot run 8-bit library tests: 8-bit library not compiled"
+  fi
+  if [ "$arg16" = yes ] ; then
+    if [ $support16 -eq 0 ] ; then
+      echo "Cannot run 16-bit library tests: 16-bit library not compiled"
       exit 1
     fi
-    test8=skip
     test16=-16
   fi
+  if [ "$arg32" = yes ] ; then
+    if [ $support32 -eq 0 ] ; then
+      echo "Cannot run 32-bit library tests: 32-bit library not compiled"
+      exit 1
+    fi
+    test32=-32
+  fi
 fi
 
-# UTF support always applies to both bit sizes if both are supported; we can't
+# UTF support always applies to all bit sizes if both are supported; we can't
 # have UTF-8 support without UTF-16 support (for example).
 
 $sim ./pcretest -C utf >/dev/null
@@ -174,10 +346,16 @@ ucp=$?
 jitopt=
 $sim ./pcretest -C jit >/dev/null
 jit=$?
-if [ $jit -ne 0 ] ; then
+if [ $jit -ne 0 -a "$nojit" != "yes" ] ; then
   jitopt=-s+
 fi
 
+# Handle any explicit skips
+
+for i in $skip; do eval do$i=no; done
+
+# If any unsuitable tests were explicitly requested, grumble.
+
 if [ $utf -eq 0 ] ; then
   if [ $do4 = yes ] ; then
     echo "Can't run test 4 because UTF support is not configured"
@@ -246,14 +424,15 @@ else
 fi
 
 # If no specific tests were requested, select all. Those that are not
-# relevant will be skipped.
+# relevant will be automatically skipped.
 
 if [ $do1  = no -a $do2  = no -a $do3  = no -a $do4  = no -a \
      $do5  = no -a $do6  = no -a $do7  = no -a $do8  = no -a \
      $do9  = no -a $do10 = no -a $do11 = no -a $do12 = no -a \
      $do13 = no -a $do14 = no -a $do15 = no -a $do16 = no -a \
      $do17 = no -a $do18 = no -a $do19 = no -a $do20 = no -a \
-     $do21 = no -a $do22 = no ] ; then
+     $do21 = no -a $do22 = no -a $do23 = no -a $do24 = no -a \
+     $do25 = no -a $do26 = no ] ; then
   do1=yes
   do2=yes
   do3=yes
@@ -276,26 +455,37 @@ if [ $do1  = no -a $do2  = no -a $do3  = no -a $do4  =
   do20=yes
   do21=yes
   do22=yes
+  do23=yes
+  do24=yes
+  do25=yes
+  do26=yes
 fi
 
+# Handle any explicit skips (again, so that an argument list may consist only
+# of explicit skips).
+
+for i in $skip; do eval do$i=no; done
+
 # Show which release and which test data
 
 echo ""
 echo PCRE C library tests using test data from $testdata
 $sim ./pcretest /dev/null
 
-for bmode in "$test8" "$test16"; do
+for bmode in "$test8" "$test16" "$test32"; do
   case "$bmode" in
     skip) continue;;
-    -16)  if [ "$test8" != "skip" ] ; then echo ""; fi
+    -16)  if [ "$test8$test32" != "skipskip" ] ; then echo ""; fi
           bits=16; echo "---- Testing 16-bit library ----"; echo "";;
+    -32)  if [ "$test8$test16" != "skipskip" ] ; then echo ""; fi
+          bits=32; echo "---- Testing 32-bit library ----"; echo "";;
     *)    bits=8; echo "---- Testing 8-bit library ----"; echo "";;
   esac
 
 # Primary test, compatible with JIT and all versions of Perl >= 5.8
 
 if [ $do1 = yes ] ; then
-  echo "Test 1: main functionality (Compatible with Perl >= 5.10)"
+  echo $title1
   for opt in "" "-s" $jitopt; do
     $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput1 testtry
     if [ $? = 0 ] ; then
@@ -313,7 +503,7 @@ fi
 # PCRE tests that are not JIT or Perl-compatible: API, errors, internals
 
 if [ $do2 = yes ] ; then
-  echo "Test 2: API, errors, internals, and non-Perl stuff (not UTF-$bits)"
+  echo $title2 "(not UTF-$bits)"
   for opt in "" "-s" $jitopt; do
     $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput2 testtry
     if [ $? = 0 ] ; then
@@ -367,7 +557,7 @@ if [ $do3 = yes ] ; then
   fi
 
   if [ "$locale" != "" ] ; then
-    echo "Test 3: locale-specific features (using '$locale' locale)"
+    echo $title3 "(using '$locale' locale)"
     for opt in "" "-s" $jitopt; do
       $sim $valgrind ./pcretest -q $bmode $opt $infile testtry
       if [ $? = 0 ] ; then
@@ -398,7 +588,7 @@ fi
 # Additional tests for UTF support
 
 if [ $do4 = yes ] ; then
-  echo "Test 4: UTF-$bits support (Compatible with Perl >= 5.10)"
+  echo ${title4A}-${bits}${title4B}
   if [ $utf -eq 0 ] ; then
     echo "  Skipped because UTF-$bits support is not available"
   else
@@ -418,7 +608,7 @@ if [ $do4 = yes ] ; then
 fi
 
 if [ $do5 = yes ] ; then
-  echo "Test 5: API, internals, and non-Perl stuff for UTF-$bits support"
+  echo ${title5}-${bits} support
   if [ $utf -eq 0 ] ; then
     echo "  Skipped because UTF-$bits support is not available"
   else
@@ -438,7 +628,7 @@ if [ $do5 = yes ] ; then
 fi
 
 if [ $do6 = yes ] ; then
-  echo "Test 6: Unicode property support (Compatible with Perl >= 5.10)"
+  echo $title6
   if [ $utf -eq 0 -o $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"
   else
@@ -460,7 +650,7 @@ fi
 # Test non-Perl-compatible Unicode property support
 
 if [ $do7 = yes ] ; then
-  echo "Test 7: API, internals, and non-Perl stuff for Unicode property support"
+  echo $title7
   if [ $utf -eq 0 -o $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"
   else
@@ -482,7 +672,7 @@ fi
 # Tests for DFA matching support
 
 if [ $do8 = yes ] ; then
-  echo "Test 8: DFA matching main functionality"
+  echo $title8
   for opt in "" "-s"; do
     $sim $valgrind ./pcretest -q $bmode $opt -dfa $testdata/testinput8 testtry
     if [ $? = 0 ] ; then
@@ -495,7 +685,7 @@ if [ $do8 = yes ] ; then
 fi
 
 if [ $do9 = yes ] ; then
-  echo "Test 9: DFA matching with UTF-$bits"
+  echo ${title9}-${bits}
   if [ $utf -eq 0 ] ; then
     echo "  Skipped because UTF-$bits support is not available"
   else
@@ -512,7 +702,7 @@ if [ $do9 = yes ] ; then
 fi
 
 if [ $do10 = yes ] ; then
-  echo "Test 10: DFA matching with Unicode properties"
+  echo $title10
   if [ $utf -eq 0 -o $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"
   else
@@ -536,7 +726,7 @@ fi
 # this test is not the same in 8-bit and 16-bit modes.
 
 if [ $do11 = yes ] ; then
-  echo "Test 11: Internal offsets and code size tests"
+  echo $title11
   if [ $link_size -ne 2 ] ; then
     echo "  Skipped because link size is not 2"
   elif [ $ucp -eq 0 ] ; then
@@ -557,8 +747,8 @@ fi
 # Test JIT-specific features when JIT is available
 
 if [ $do12 = yes ] ; then
-  echo "Test 12: JIT-specific features (JIT available)"
-  if [ $jit -eq 0 ] ; then
+  echo $title12
+  if [ $jit -eq 0 -o "$nojit" = "yes" ] ; then
     echo "  Skipped because JIT is not available or not usable"
   else
     $sim $valgrind ./pcretest -q $bmode $testdata/testinput12 testtry
@@ -574,7 +764,7 @@ fi
 # Test JIT-specific features when JIT is not available
 
 if [ $do13 = yes ] ; then
-  echo "Test 13: JIT-specific features (JIT not available)"
+  echo $title13
   if [ $jit -ne 0 ] ; then
     echo "  Skipped because JIT is available"
   else
@@ -591,11 +781,12 @@ fi
 # Tests for 8-bit-specific features
 
 if [ "$do14" = yes ] ; then
-  echo "Test 14: specials for the basic 8-bit library"
-  if [ "$bits" = "16" ] ; then
-    echo "  Skipped when running 16-bit tests"
+  echo $title14
+  if [ "$bits" = "16" -o "$bits" = "32" ] ; then
+    echo "  Skipped when running 16/32-bit tests"
   else
     cp -f $testdata/saved16 testsaved16
+    cp -f $testdata/saved32 testsaved32
     for opt in "" "-s" $jitopt; do
       $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput14 testtry
       if [ $? = 0 ] ; then
@@ -614,9 +805,9 @@ fi
 # Tests for 8-bit-specific features (needs UTF-8 support)
 
 if [ "$do15" = yes ] ; then
-  echo "Test 15: specials for the 8-bit library with UTF-8 support"
-  if [ "$bits" = "16" ] ; then
-    echo "  Skipped when running 16-bit tests"
+  echo $title15
+  if [ "$bits" = "16" -o "$bits" = "32" ] ; then
+    echo "  Skipped when running 16/32-bit tests"
   elif [ $utf -eq 0 ] ; then
     echo "  Skipped because UTF-$bits support is not available"
   else
@@ -638,9 +829,9 @@ fi
 # Tests for 8-bit-specific features (Unicode property support)
 
 if [ $do16 = yes ] ; then
-  echo "Test 16: specials for the 8-bit library with Unicode propery support"
-  if [ "$bits" = "16" ] ; then
-    echo "  Skipped when running 16-bit tests"
+  echo $title16
+  if [ "$bits" = "16" -o "$bits" = "32" ] ; then
+    echo "  Skipped when running 16/32-bit tests"
   elif [ $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"
   else
@@ -659,10 +850,10 @@ if [ $do16 = yes ] ; then
   fi
 fi
 
-# Tests for 16-bit-specific features
+# Tests for 16/32-bit-specific features
 
 if [ $do17 = yes ] ; then
-  echo "Test 17: specials for the basic 16-bit library"
+  echo $title17
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   else
@@ -681,10 +872,10 @@ if [ $do17 = yes ] ; then
   fi
 fi
 
-# Tests for 16-bit-specific features (UTF-16 support)
+# Tests for 16/32-bit-specific features (UTF-16/32 support)
 
 if [ $do18 = yes ] ; then
-  echo "Test 18: specials for the 16-bit library with UTF-16 support"
+  echo $title18
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   elif [ $utf -eq 0 ] ; then
@@ -693,7 +884,7 @@ if [ $do18 = yes ] ; then
     for opt in "" "-s" $jitopt; do
       $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput18 testtry
       if [ $? = 0 ] ; then
-        $cf $testdata/testoutput18 testtry
+        $cf $testdata/testoutput18-$bits testtry
         if [ $? != 0 ] ; then exit 1; fi
       else exit 1
       fi
@@ -705,10 +896,10 @@ if [ $do18 = yes ] ; then
   fi
 fi
 
-# Tests for 16-bit-specific features (Unicode property support)
+# Tests for 16/32-bit-specific features (Unicode property support)
 
 if [ $do19 = yes ] ; then
-  echo "Test 19: specials for the 16-bit library with Unicode propery support"
+  echo $title19
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   elif [ $ucp -eq 0 ] ; then
@@ -729,15 +920,15 @@ if [ $do19 = yes ] ; then
   fi
 fi
 
-# Tests for 16-bit-specific features in DFA non-UTF-16 mode
+# Tests for 16/32-bit-specific features in DFA non-UTF-16/32 mode
 
 if [ $do20 = yes ] ; then
-  echo "Test 20: DFA specials for the basic 16-bit library"
+  echo $title20
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   else
     for opt in "" "-s"; do
-      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput20 testtry
+      $sim $valgrind ./pcretest -q $bmode $opt -dfa $testdata/testinput20 testtry
       if [ $? = 0 ] ; then
         $cf $testdata/testoutput20 testtry
         if [ $? != 0 ] ; then exit 1; fi
@@ -750,10 +941,10 @@ if [ $do20 = yes ] ; then
   fi
 fi
 
-# Tests for reloads with 16-bit library
+# Tests for reloads with 16/32-bit library
 
 if [ $do21 = yes ] ; then
-  echo "Test 21: reloads for the basic 16-bit library"
+  echo $title21
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   elif [ $link_size -ne 2 ] ; then
@@ -762,9 +953,11 @@ if [ $do21 = yes ] ; then
     cp -f $testdata/saved8 testsaved8
     cp -f $testdata/saved16LE-1 testsaved16LE-1
     cp -f $testdata/saved16BE-1 testsaved16BE-1
+    cp -f $testdata/saved32LE-1 testsaved32LE-1
+    cp -f $testdata/saved32BE-1 testsaved32BE-1
     $sim $valgrind ./pcretest -q $bmode $testdata/testinput21 testtry
     if [ $? = 0 ] ; then
-      $cf $testdata/testoutput21 testtry
+      $cf $testdata/testoutput21-$bits testtry
       if [ $? != 0 ] ; then exit 1; fi
     else exit 1
     fi
@@ -772,10 +965,10 @@ if [ $do21 = yes ] ; then
   fi
 fi
 
-# Tests for reloads with 16-bit library (UTF-16 support)
+# Tests for reloads with 16/32-bit library (UTF-16 support)
 
 if [ $do22 = yes ] ; then
-  echo "Test 22: reloads for the 16-bit library with UTF-16 support"
+  echo $title22
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   elif [ $utf -eq 0 ] ; then
@@ -785,9 +978,11 @@ if [ $do22 = yes ] ; then
   else
     cp -f $testdata/saved16LE-2 testsaved16LE-2
     cp -f $testdata/saved16BE-2 testsaved16BE-2
+    cp -f $testdata/saved32LE-2 testsaved32LE-2
+    cp -f $testdata/saved32BE-2 testsaved32BE-2
     $sim $valgrind ./pcretest -q $bmode $testdata/testinput22 testtry
     if [ $? = 0 ] ; then
-      $cf $testdata/testoutput22 testtry
+      $cf $testdata/testoutput22-$bits testtry
       if [ $? != 0 ] ; then exit 1; fi
     else exit 1
     fi
@@ -795,7 +990,71 @@ if [ $do22 = yes ] ; then
   fi
 fi
 
-# End of loop for 8-bit/16-bit tests
+if [ $do23 = yes ] ; then
+  echo $title23
+  if [ "$bits" = "8" -o "$bits" = "32" ] ; then
+    echo "  Skipped when running 8/32-bit tests"
+  else
+    $sim $valgrind ./pcretest -q $bmode $testdata/testinput23 testtry
+    if [ $? = 0 ] ; then
+      $cf $testdata/testoutput23 testtry
+      if [ $? != 0 ] ; then exit 1; fi
+    else exit 1
+    fi
+    echo "  OK"
+  fi
+fi
+
+if [ $do24 = yes ] ; then
+  echo $title24
+  if [ "$bits" = "8" -o "$bits" = "32" ] ; then
+    echo "  Skipped when running 8/32-bit tests"
+  elif [ $utf -eq 0 ] ; then
+    echo "  Skipped because UTF-$bits support is not available"
+  else
+    $sim $valgrind ./pcretest -q $bmode $testdata/testinput24 testtry
+    if [ $? = 0 ] ; then
+      $cf $testdata/testoutput24 testtry
+      if [ $? != 0 ] ; then exit 1; fi
+    else exit 1
+    fi
+    echo "  OK"
+  fi
+fi
+
+if [ $do25 = yes ] ; then
+  echo $title25
+  if [ "$bits" = "8" -o "$bits" = "16" ] ; then
+    echo "  Skipped when running 8/16-bit tests"
+  else
+    $sim $valgrind ./pcretest -q $bmode $testdata/testinput25 testtry
+    if [ $? = 0 ] ; then
+      $cf $testdata/testoutput25 testtry
+      if [ $? != 0 ] ; then exit 1; fi
+    else exit 1
+    fi
+    echo "  OK"
+  fi
+fi
+
+if [ $do26 = yes ] ; then
+  echo $title26
+  if [ "$bits" = "8" -o "$bits" = "16" ] ; then
+    echo "  Skipped when running 8/16-bit tests"
+  elif [ $utf -eq 0 ] ; then
+    echo "  Skipped because UTF-$bits support is not available"
+  else
+    $sim $valgrind ./pcretest -q $bmode $testdata/testinput26 testtry
+    if [ $? = 0 ] ; then
+      $cf $testdata/testoutput26 testtry
+      if [ $? != 0 ] ; then exit 1; fi
+    else exit 1
+    fi
+    echo "  OK"
+  fi
+fi
+
+# End of loop for 8/16/32-bit tests
 done
 
 # Clean up local working files