[BACK]Return to RunTest CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / pcre

Diff for /embedaddon/pcre/RunTest between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:05:51 version 1.1.1.2, 2012/02/21 23:50:25
Line 18 Line 18
 # two tests for JIT-specific features, one to be run when JIT support is  # two tests for JIT-specific features, one to be run when JIT support is
 # available, and one when it is not.  # available, and one when it is not.
   
# The arguments for this script can be individual test numbers, or the word# 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  # "valgrind", or "sim" followed by an argument to run cross-compiled
 # executables under a simulator, for example:  # executables under a simulator, for example:
 #  #
Line 26 Line 29
   
 valgrind=  valgrind=
 sim=  sim=
   arg8=
   arg16=
   
   # 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  # Select which tests to run; for those that are explicitly requested, check
 # that the necessary optional facilities are available.  # that the necessary optional facilities are available.
   
Line 45  do12=no Line 53  do12=no
 do13=no  do13=no
 do14=no  do14=no
 do15=no  do15=no
   do16=no
   do17=no
   do18=no
   do19=no
   do20=no
   do21=no
   do22=no
   
 while [ $# -gt 0 ] ; do  while [ $# -gt 0 ] ; do
   case $1 in    case $1 in
Line 63  while [ $# -gt 0 ] ; do Line 78  while [ $# -gt 0 ] ; do
    13) do13=yes;;     13) do13=yes;;
    14) do14=yes;;     14) do14=yes;;
    15) do15=yes;;     15) do15=yes;;
      16) do16=yes;;
      17) do17=yes;;
      18) do18=yes;;
      19) do19=yes;;
      20) do20=yes;;
      21) do21=yes;;
      22) do22=yes;;
      -8) arg8=yes;;
     -16) arg16=yes;;
    valgrind) valgrind="valgrind -q --smc-check=all";;     valgrind) valgrind="valgrind -q --smc-check=all";;
    sim) shift; sim=$1;;     sim) shift; sim=$1;;
     *) echo "Unknown test number $1"; exit 1;;      *) echo "Unknown test number $1"; exit 1;;
Line 93  fi Line 117  fi
 # strips only linefeeds from the output of a `backquoted` command. Hence the  # strips only linefeeds from the output of a `backquoted` command. Hence the
 # alternative patterns.  # alternative patterns.
   
case `$sim ./pcretest -C | $sim ./pcregrep 'Internal link size'` in$sim ./pcretest -C linksize >/dev/null
  *2|*2[[:space:]]) link_size=2;;link_size=$?
  *3|*3[[:space:]]) link_size=3;;if [ $link_size -lt 2 ] ; then
  *4|*4[[:space:]]) link_size=4;;  echo "Failed to find internal link size"
   *) echo "Failed to find internal link size"; exit 1;;  exit 1
esacfi
 if [ $link_size -gt 4 ] ; then
   echo "Failed to find internal link size"
   exit 1
 fi
   
$sim ./pcretest -C | $sim ./pcregrep 'No UTF-8 support' >/dev/null# Both 8-bit and 16-bit character strings may be supported, but only one
utf8=$?# need be.
   
$sim ./pcretest -C | $sim ./pcregrep 'No Unicode properties support' >/dev/null$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
   fi
   if [ "$arg16" = yes -a "$arg8" != yes ] ; then
     test8=skip
   fi
 else
   if [ $support8 -ne 0 ] ; then
     if [ "$arg16" = yes ] ; then
       echo "Cannot run 16-bit library tests: 16-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"
       exit 1
     fi
     test8=skip
     test16=-16
   fi
 fi
 
 # UTF support always applies to both 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
 utf=$?
 
 $sim ./pcretest -C ucp >/dev/null
 ucp=$?  ucp=$?
   
 jitopt=  jitopt=
$sim ./pcretest -C | $sim ./pcregrep 'No just-in-time compiler support' \$sim ./pcretest -C jit >/dev/null
  >/dev/null 
 jit=$?  jit=$?
 if [ $jit -ne 0 ] ; then  if [ $jit -ne 0 ] ; then
   jitopt=-s+    jitopt=-s+
 fi  fi
   
if [ $utf8 -eq 0 ] ; thenif [ $utf -eq 0 ] ; then
   if [ $do4 = yes ] ; then    if [ $do4 = yes ] ; then
    echo "Can't run test 4 because UTF-8 support is not configured"    echo "Can't run test 4 because UTF support is not configured"
     exit 1      exit 1
   fi    fi
   if [ $do5 = yes ] ; then    if [ $do5 = yes ] ; then
    echo "Can't run test 5 because UTF-8 support is not configured"    echo "Can't run test 5 because UTF support is not configured"
     exit 1      exit 1
   fi    fi
  if [ $do8 = yes ] ; then  if [ $do9 = yes ] ; then
    echo "Can't run test 8 because UTF-8 support is not configured"    echo "Can't run test 8 because UTF support is not configured"
     exit 1      exit 1
   fi    fi
  if [ $do12 = yes ] ; then  if [ $do15 = yes ] ; then
    echo "Can't run test 12 because UTF-8 support is not configured"    echo "Can't run test 15 because UTF support is not configured"
     exit 1      exit 1
   fi    fi
     if [ $do18 = yes ] ; then
       echo "Can't run test 18 because UTF support is not configured"
     fi
     if [ $do22 = yes ] ; then
       echo "Can't run test 22 because UTF support is not configured"
     fi
 fi  fi
   
 if [ $ucp -eq 0 ] ; then  if [ $ucp -eq 0 ] ; then
Line 138  if [ $ucp -eq 0 ] ; then Line 208  if [ $ucp -eq 0 ] ; then
     echo "Can't run test 6 because Unicode property support is not configured"      echo "Can't run test 6 because Unicode property support is not configured"
     exit 1      exit 1
   fi    fi
  if [ $do9 = yes ] ; then  if [ $do7 = yes ] ; then
    echo "Can't run test 9 because Unicode property support is not configured"    echo "Can't run test 7 because Unicode property support is not configured"
     exit 1      exit 1
   fi    fi
   if [ $do10 = yes ] ; then    if [ $do10 = yes ] ; then
     echo "Can't run test 10 because Unicode property support is not configured"      echo "Can't run test 10 because Unicode property support is not configured"
     exit 1      exit 1
   fi    fi
  if [ $do13 = yes ] ; then  if [ $do16 = yes ] ; then
    echo "Can't run test 12 because Unicode property support is not configured"    echo "Can't run test 16 because Unicode property support is not configured"
     exit 1      exit 1
   fi    fi
     if [ $do19 = yes ] ; then
       echo "Can't run test 19 because Unicode property support is not configured"
       exit 1
     fi
 fi  fi
   
 if [ $link_size -ne 2 ] ; then  if [ $link_size -ne 2 ] ; then
  if [ $do10 = yes ] ; then  if [ $do11 = yes ] ; then
    echo "Can't run test 10 because the link size ($link_size) is not 2"    echo "Can't run test 11 because the link size ($link_size) is not 2"
     exit 1      exit 1
   fi    fi
 fi  fi
   
 if [ $jit -eq 0 ] ; then  if [ $jit -eq 0 ] ; then
  if [ $do14 = "yes" ] ; then  if [ $do12 = "yes" ] ; then
    echo "Can't run test 14 because JIT support is not configured"    echo "Can't run test 12 because JIT support is not configured"
     exit 1      exit 1
   fi    fi
 else  else
  if [ $do15 = "yes" ] ; then  if [ $do13 = "yes" ] ; then
    echo "Can't run test 15 because JIT support is configured"    echo "Can't run test 13 because JIT support is configured"
     exit 1      exit 1
   fi    fi
 fi  fi
Line 177  fi Line 251  fi
 if [ $do1  = no -a $do2  = no -a $do3  = no -a $do4  = no -a \  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 \       $do5  = no -a $do6  = no -a $do7  = no -a $do8  = no -a \
      $do9  = no -a $do10 = no -a $do11 = no -a $do12 = no -a \       $do9  = no -a $do10 = no -a $do11 = no -a $do12 = no -a \
     $do13 = no -a $do14 = no -a $do15 = no ] ; then     $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
   do1=yes    do1=yes
   do2=yes    do2=yes
   do3=yes    do3=yes
Line 193  if [ $do1  = no -a $do2  = no -a $do3  = no -a $do4  = Line 269  if [ $do1  = no -a $do2  = no -a $do3  = no -a $do4  =
   do13=yes    do13=yes
   do14=yes    do14=yes
   do15=yes    do15=yes
     do16=yes
     do17=yes
     do18=yes
     do19=yes
     do20=yes
     do21=yes
     do22=yes
 fi  fi
   
 # Show which release and which test data  # Show which release and which test data
Line 201  echo "" Line 284  echo ""
 echo PCRE C library tests using test data from $testdata  echo PCRE C library tests using test data from $testdata
 $sim ./pcretest /dev/null  $sim ./pcretest /dev/null
   
   for bmode in "$test8" "$test16"; do
     case "$bmode" in
       skip) continue;;
       -16)  if [ "$test8" != "skip" ] ; then echo ""; fi
             bits=16; echo "---- Testing 16-bit library ----"; echo "";;
       *)    bits=8; echo "---- Testing 8-bit library ----"; echo "";;
     esac
   
 # Primary test, compatible with JIT and all versions of Perl >= 5.8  # Primary test, compatible with JIT and all versions of Perl >= 5.8
   
 if [ $do1 = yes ] ; then  if [ $do1 = yes ] ; then
  echo "Test 1: main functionality (Compatible with Perl >= 5.8)"  echo "Test 1: main functionality (Compatible with Perl >= 5.10)"
   for opt in "" "-s" $jitopt; do    for opt in "" "-s" $jitopt; do
    $sim $valgrind ./pcretest -q $opt $testdata/testinput1 testtry    $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput1 testtry
     if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
       $cf $testdata/testoutput1 testtry        $cf $testdata/testoutput1 testtry
       if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
Line 222  fi Line 313  fi
 # PCRE tests that are not JIT or Perl-compatible: API, errors, internals  # PCRE tests that are not JIT or Perl-compatible: API, errors, internals
   
 if [ $do2 = yes ] ; then  if [ $do2 = yes ] ; then
  echo "Test 2: API, errors, internals, and non-Perl stuff (not UTF-8)"  echo "Test 2: API, errors, internals, and non-Perl stuff (not UTF-$bits)"
   for opt in "" "-s" $jitopt; do    for opt in "" "-s" $jitopt; do
    $sim $valgrind ./pcretest -q $opt $testdata/testinput2 testtry    $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput2 testtry
     if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
       $cf $testdata/testoutput2 testtry        $cf $testdata/testoutput2 testtry
       if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
Line 278  if [ $do3 = yes ] ; then Line 369  if [ $do3 = yes ] ; then
   if [ "$locale" != "" ] ; then    if [ "$locale" != "" ] ; then
     echo "Test 3: locale-specific features (using '$locale' locale)"      echo "Test 3: locale-specific features (using '$locale' locale)"
     for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
      $sim $valgrind ./pcretest -q $opt $infile testtry      $sim $valgrind ./pcretest -q $bmode $opt $infile testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
         $cf $outfile testtry          $cf $outfile testtry
         if [ $? != 0 ] ; then          if [ $? != 0 ] ; then
Line 304  if [ $do3 = yes ] ; then Line 395  if [ $do3 = yes ] ; then
   fi    fi
 fi  fi
   
# Additional tests for UTF8 support# Additional tests for UTF support
   
 if [ $do4 = yes ] ; then  if [ $do4 = yes ] ; then
  echo "Test 4: UTF-8 support (Compatible with Perl >= 5.8)"  echo "Test 4: UTF-$bits support (Compatible with Perl >= 5.10)"
  if [ $utf8 -eq 0 ] ; then  if [ $utf -eq 0 ] ; then
    echo "  Skipped because UTF-8 support is not available"    echo "  Skipped because UTF-$bits support is not available"
   else    else
     for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
      $sim $valgrind ./pcretest -q $opt $testdata/testinput4 testtry      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput4 testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
         $cf $testdata/testoutput4 testtry          $cf $testdata/testoutput4 testtry
         if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
Line 327  if [ $do4 = yes ] ; then Line 418  if [ $do4 = yes ] ; then
 fi  fi
   
 if [ $do5 = yes ] ; then  if [ $do5 = yes ] ; then
  echo "Test 5: API, internals, and non-Perl stuff for UTF-8 support"  echo "Test 5: API, internals, and non-Perl stuff for UTF-$bits support"
  if [ $utf8 -eq 0 ] ; then  if [ $utf -eq 0 ] ; then
    echo "  Skipped because UTF-8 support is not available"    echo "  Skipped because UTF-$bits support is not available"
   else    else
     for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
      $sim $valgrind ./pcretest -q $opt $testdata/testinput5 testtry      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput5 testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
         $cf $testdata/testoutput5 testtry          $cf $testdata/testoutput5 testtry
         if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
Line 348  fi Line 439  fi
   
 if [ $do6 = yes ] ; then  if [ $do6 = yes ] ; then
   echo "Test 6: Unicode property support (Compatible with Perl >= 5.10)"    echo "Test 6: Unicode property support (Compatible with Perl >= 5.10)"
  if [ $utf8 -eq 0 -o $ucp -eq 0 ] ; then  if [ $utf -eq 0 -o $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"      echo "  Skipped because Unicode property support is not available"
   else    else
     for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
      $sim $valgrind ./pcretest -q $opt $testdata/testinput6 testtry      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput6 testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
         $cf $testdata/testoutput6 testtry          $cf $testdata/testoutput6 testtry
         if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
Line 366  if [ $do6 = yes ] ; then Line 457  if [ $do6 = yes ] ; then
   fi    fi
 fi  fi
   
# Tests for DFA matching support# Test non-Perl-compatible Unicode property support
   
 if [ $do7 = yes ] ; then  if [ $do7 = yes ] ; then
  echo "Test 7: DFA matching"  echo "Test 7: API, internals, and non-Perl stuff for Unicode property support"
   if [ $utf -eq 0 -o $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"
   else
     for opt in "" "-s" $jitopt; do
       $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput7 testtry
       if [ $? = 0 ] ; then
         $cf $testdata/testoutput7 testtry
         if [ $? != 0 ] ; then exit 1; fi
       else exit 1
       fi
       if [ "$opt" = "-s" ] ; then echo "  OK with study"
       elif [ "$opt" = "-s+" ] ; then echo "  OK with JIT study"
       else echo "  OK"
       fi
     done
   fi
 fi
 
 # Tests for DFA matching support
 
 if [ $do8 = yes ] ; then
   echo "Test 8: DFA matching main functionality"
   for opt in "" "-s"; do    for opt in "" "-s"; do
    $sim $valgrind ./pcretest -q $opt -dfa $testdata/testinput7 testtry    $sim $valgrind ./pcretest -q $bmode $opt -dfa $testdata/testinput8 testtry
     if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
      $cf $testdata/testoutput7 testtry      $cf $testdata/testoutput8 testtry
       if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
     else exit 1      else exit 1
     fi      fi
Line 381  if [ $do7 = yes ] ; then Line 494  if [ $do7 = yes ] ; then
   done    done
 fi  fi
   
if [ $do8 = yes ] ; thenif [ $do9 = yes ] ; then
  echo "Test 8: DFA matching with UTF-8"  echo "Test 9: DFA matching with UTF-$bits"
  if [ $utf8 -eq 0 ] ; then  if [ $utf -eq 0 ] ; then
    echo "  Skipped because UTF-8 support is not available"    echo "  Skipped because UTF-$bits support is not available"
   else    else
     for opt in "" "-s"; do      for opt in "" "-s"; do
      $sim $valgrind ./pcretest -q $opt -dfa $testdata/testinput8 testtry      $sim $valgrind ./pcretest -q $bmode $opt -dfa $testdata/testinput9 testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
        $cf $testdata/testoutput8 testtry        $cf $testdata/testoutput9 testtry
         if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
       else exit 1        else exit 1
       fi        fi
Line 398  if [ $do8 = yes ] ; then Line 511  if [ $do8 = yes ] ; then
   fi    fi
 fi  fi
   
if [ $do9 = yes ] ; thenif [ $do10 = yes ] ; then
  echo "Test 9: DFA matching with Unicode properties"  echo "Test 10: DFA matching with Unicode properties"
  if [ $utf8 -eq 0 -o $ucp -eq 0 ] ; then  if [ $utf -eq 0 -o $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"      echo "  Skipped because Unicode property support is not available"
   else    else
     for opt in "" "-s"; do      for opt in "" "-s"; do
      $sim $valgrind ./pcretest -q $opt -dfa $testdata/testinput9 testtry      $sim $valgrind ./pcretest -q $bmode $opt -dfa $testdata/testinput10 testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
        $cf $testdata/testoutput9 testtry        $cf $testdata/testoutput10 testtry
         if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
       else exit 1        else exit 1
       fi        fi
Line 419  fi Line 532  fi
 # is Unicode property support and the link size is 2. The actual tests are  # is Unicode property support and the link size is 2. The actual tests are
 # mostly the same as in some of the above, but in this test we inspect some  # mostly the same as in some of the above, but in this test we inspect some
 # offsets and sizes that require a known link size. This is a doublecheck for  # offsets and sizes that require a known link size. This is a doublecheck for
# the maintainer, just in case something changes unexpectely.# the maintainer, just in case something changes unexpectely. The output from
 # this test is not the same in 8-bit and 16-bit modes.
   
if [ $do10 = yes ] ; thenif [ $do11 = yes ] ; then
  echo "Test 10: Internal offsets and code size tests"  echo "Test 11: Internal offsets and code size tests"
   if [ $link_size -ne 2 ] ; then    if [ $link_size -ne 2 ] ; then
     echo "  Skipped because link size is not 2"      echo "  Skipped because link size is not 2"
   elif [ $ucp -eq 0 ] ; then    elif [ $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"      echo "  Skipped because Unicode property support is not available"
   else    else
     for opt in "" "-s"; do      for opt in "" "-s"; do
      $sim $valgrind ./pcretest -q $opt $testdata/testinput10 testtry      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput11 testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
        $cf $testdata/testoutput10 testtry        $cf $testdata/testoutput11-$bits testtry
         if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
       else exit 1        else exit 1
       fi        fi
Line 440  if [ $do10 = yes ] ; then Line 554  if [ $do10 = yes ] ; then
   fi    fi
 fi  fi
   
# Test of Perl >= 5.10 features without UTF8 support# Test JIT-specific features when JIT is available
   
if [ $do11 = yes ] ; thenif [ $do12 = yes ] ; then
  echo "Test 11: Features from Perl >= 5.10 without UTF8 support"  echo "Test 12: JIT-specific features (JIT available)"
  for opt in "" "-s" $jitopt; do  if [ $jit -eq 0 ] ; then
    $sim $valgrind ./pcretest -q $opt $testdata/testinput11 testtry    echo "  Skipped because JIT is not available or not usable"
   else
     $sim $valgrind ./pcretest -q $bmode $testdata/testinput12 testtry
     if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
      $cf $testdata/testoutput11 testtry      $cf $testdata/testoutput12 testtry
       if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
     else exit 1      else exit 1
     fi      fi
    if [ "$opt" = "-s" ] ; then echo "  OK with study"    echo "  OK"
    elif [ "$opt" = "-s+" ] ; then echo "  OK with JIT study"  fi
    else echo "  OK"fi
 
 # Test JIT-specific features when JIT is not available
 
 if [ $do13 = yes ] ; then
   echo "Test 13: JIT-specific features (JIT not available)"
   if [ $jit -ne 0 ] ; then
     echo "  Skipped because JIT is available"
   else
     $sim $valgrind ./pcretest -q $bmode $testdata/testinput13 testtry
     if [ $? = 0 ] ; then
       $cf $testdata/testoutput13 testtry
       if [ $? != 0 ] ; then exit 1; fi
     else exit 1
     fi      fi
  done    echo "  OK"
   fi
 fi  fi
   
# Test of Perl >= 5.10 features with UTF8 support# Tests for 8-bit-specific features
   
if [ $do12 = yes ] ; thenif [ "$do14" = yes ] ; then
  echo "Test 12: Features from Perl >= 5.10 with UTF8 support"  echo "Test 14: specials for the basic 8-bit library"
  if [ $utf8 -eq 0 ] ; then  if [ "$bits" = "16" ] ; then
    echo "  Skipped because UTF-8 support is not available"    echo "  Skipped when running 16-bit tests"
   else    else
       cp -f $testdata/saved16 testsaved16
     for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
      $sim $valgrind ./pcretest -q $opt $testdata/testinput12 testtry      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput14 testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
        $cf $testdata/testoutput12 testtry        $cf $testdata/testoutput14 testtry
         if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
       else exit 1        else exit 1
       fi        fi
Line 480  if [ $do12 = yes ] ; then Line 611  if [ $do12 = yes ] ; then
   fi    fi
 fi  fi
   
# Test non-Perl-compatible Unicode property support# Tests for 8-bit-specific features (needs UTF-8 support)
   
if [ $do13 = yes ] ; thenif [ "$do15" = yes ] ; then
  echo "Test 13: API, internals, and non-Perl stuff for Unicode property support"  echo "Test 15: specials for the 8-bit library with UTF-8 support"
  if [ $utf8 -eq 0 -o $ucp -eq 0 ] ; then  if [ "$bits" = "16" ] ; then
     echo "  Skipped when running 16-bit tests"
   elif [ $utf -eq 0 ] ; then
     echo "  Skipped because UTF-$bits support is not available"
   else
     for opt in "" "-s" $jitopt; do
       $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput15 testtry
       if [ $? = 0 ] ; then
         $cf $testdata/testoutput15 testtry
         if [ $? != 0 ] ; then exit 1; fi
       else exit 1
       fi
       if [ "$opt" = "-s" ] ; then echo "  OK with study"
       elif [ "$opt" = "-s+" ] ; then echo "  OK with JIT study"
       else echo "  OK"
       fi
     done
   fi
 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"
   elif [ $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"      echo "  Skipped because Unicode property support is not available"
   else    else
     for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
      $sim $valgrind ./pcretest -q $opt $testdata/testinput13 testtry      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput16 testtry
       if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
        $cf $testdata/testoutput13 testtry        $cf $testdata/testoutput16 testtry
         if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
       else exit 1        else exit 1
       fi        fi
Line 502  if [ $do13 = yes ] ; then Line 659  if [ $do13 = yes ] ; then
   fi    fi
 fi  fi
   
# Test JIT-specific features when JIT is available# Tests for 16-bit-specific features
   
if [ $do14 = yes ] ; thenif [ $do17 = yes ] ; then
  echo "Test 14: JIT-specific features (JIT available)"  echo "Test 17: specials for the basic 16-bit library"
  if [ $jit -eq 0 ] ; then  if [ "$bits" = "8" ] ; then
    echo "  Skipped because JIT is not available or not usable"    echo "  Skipped when running 8-bit tests"
   else    else
    $sim $valgrind ./pcretest -q $testdata/testinput14 testtry    for opt in "" "-s" $jitopt; do
       $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput17 testtry
       if [ $? = 0 ] ; then
         $cf $testdata/testoutput17 testtry
         if [ $? != 0 ] ; then exit 1; fi
       else exit 1
       fi
       if [ "$opt" = "-s" ] ; then echo "  OK with study"
       elif [ "$opt" = "-s+" ] ; then echo "  OK with JIT study"
       else echo "  OK"
       fi
     done
   fi
 fi
 
 # Tests for 16-bit-specific features (UTF-16 support)
 
 if [ $do18 = yes ] ; then
   echo "Test 18: specials for the 16-bit library with UTF-16 support"
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   elif [ $utf -eq 0 ] ; then
     echo "  Skipped because UTF-$bits support is not available"
   else
     for opt in "" "-s" $jitopt; do
       $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput18 testtry
       if [ $? = 0 ] ; then
         $cf $testdata/testoutput18 testtry
         if [ $? != 0 ] ; then exit 1; fi
       else exit 1
       fi
       if [ "$opt" = "-s" ] ; then echo "  OK with study"
       elif [ "$opt" = "-s+" ] ; then echo "  OK with JIT study"
       else echo "  OK"
       fi
     done
   fi
 fi
 
 # Tests for 16-bit-specific features (Unicode property support)
 
 if [ $do19 = yes ] ; then
   echo "Test 19: specials for the 16-bit library with Unicode propery support"
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   elif [ $ucp -eq 0 ] ; then
     echo "  Skipped because Unicode property support is not available"
   else
     for opt in "" "-s" $jitopt; do
       $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput19 testtry
       if [ $? = 0 ] ; then
         $cf $testdata/testoutput19 testtry
         if [ $? != 0 ] ; then exit 1; fi
       else exit 1
       fi
       if [ "$opt" = "-s" ] ; then echo "  OK with study"
       elif [ "$opt" = "-s+" ] ; then echo "  OK with JIT study"
       else echo "  OK"
       fi
     done
   fi
 fi
 
 # Tests for 16-bit-specific features in DFA non-UTF-16 mode
 
 if [ $do20 = yes ] ; then
   echo "Test 20: DFA specials for the basic 16-bit library"
   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
       if [ $? = 0 ] ; then
         $cf $testdata/testoutput20 testtry
         if [ $? != 0 ] ; then exit 1; fi
       else exit 1
       fi
       if [ "$opt" = "-s" ] ; then echo "  OK with study"
       else echo "  OK"
       fi
     done
   fi
 fi
 
 # Tests for reloads with 16-bit library
 
 if [ $do21 = yes ] ; then
   echo "Test 21: reloads for the basic 16-bit library"
   if [ "$bits" = "8" ] ; then
     echo "  Skipped when running 8-bit tests"
   elif [ $link_size -ne 2 ] ; then
     echo "  Skipped because link size is not 2"
   else
     cp -f $testdata/saved8 testsaved8
     cp -f $testdata/saved16LE-1 testsaved16LE-1
     cp -f $testdata/saved16BE-1 testsaved16BE-1
     $sim $valgrind ./pcretest -q $bmode $testdata/testinput21 testtry
     if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
      $cf $testdata/testoutput14 testtry      $cf $testdata/testoutput21 testtry
       if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
     else exit 1      else exit 1
     fi      fi
Line 519  if [ $do14 = yes ] ; then Line 772  if [ $do14 = yes ] ; then
   fi    fi
 fi  fi
   
# Test JIT-specific features when JIT is not available# Tests for reloads with 16-bit library (UTF-16 support)
   
if [ $do15 = yes ] ; thenif [ $do22 = yes ] ; then
  echo "Test 15: JIT-specific features (JIT not available)"  echo "Test 22: reloads for the 16-bit library with UTF-16 support"
  if [ $jit -ne 0 ] ; then  if [ "$bits" = "8" ] ; then
    echo "  Skipped because JIT is available"    echo "  Skipped when running 8-bit tests"
   elif [ $utf -eq 0 ] ; then
     echo "  Skipped because UTF-$bits support is not available"
   elif [ $link_size -ne 2 ] ; then
     echo "  Skipped because link size is not 2"
   else    else
    $sim $valgrind ./pcretest -q $testdata/testinput15 testtry    cp -f $testdata/saved16LE-2 testsaved16LE-2
     cp -f $testdata/saved16BE-2 testsaved16BE-2
     $sim $valgrind ./pcretest -q $bmode $testdata/testinput22 testtry
     if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
      $cf $testdata/testoutput15 testtry      $cf $testdata/testoutput22 testtry
       if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
     else exit 1      else exit 1
     fi      fi
     echo "  OK"      echo "  OK"
   fi    fi
 fi  fi
   
   # End of loop for 8-bit/16-bit tests
   done
   
   # Clean up local working files
   rm -f test3input test3output testNinput testsaved* teststderr teststdout testtry
   
 # End  # End
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>