/[pcre]/code/trunk/RunTest
ViewVC logotype

Diff of /code/trunk/RunTest

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1641 by ph10, Tue Mar 4 10:45:15 2014 UTC revision 1642 by ph10, Tue Mar 1 12:48:35 2016 UTC
# Line 178  nojit= Line 178  nojit=
178  sim=  sim=
179  skip=  skip=
180  valgrind=  valgrind=
181    vjs=
182    
183  # This is in case the caller has set aliases (as I do - PH)  # This is in case the caller has set aliases (as I do - PH)
184  unset cp ls mv rm  unset cp ls mv rm
# Line 357  $sim ./pcretest -C jit >/dev/null Line 358  $sim ./pcretest -C jit >/dev/null
358  jit=$?  jit=$?
359  if [ $jit -ne 0 -a "$nojit" != "yes" ] ; then  if [ $jit -ne 0 -a "$nojit" != "yes" ] ; then
360    jitopt=-s+    jitopt=-s+
361      if [ "$valgrind" != "" ] ; then
362        vjs="--suppressions=$testdata/valgrind-jit.supp"
363      fi
364  fi  fi
365    
366  # If no specific tests were requested, select all. Those that are not  # If no specific tests were requested, select all. Those that are not
# Line 423  for bmode in "$test8" "$test16" "$test32 Line 427  for bmode in "$test8" "$test16" "$test32
427  if [ $do1 = yes ] ; then  if [ $do1 = yes ] ; then
428    echo $title1    echo $title1
429    for opt in "" "-s" $jitopt; do    for opt in "" "-s" $jitopt; do
430      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput1 testtry      $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput1 testtry
431      if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
432        $cf $testdata/testoutput1 testtry        $cf $testdata/testoutput1 testtry
433        if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
# Line 441  fi Line 445  fi
445  if [ $do2 = yes ] ; then  if [ $do2 = yes ] ; then
446    echo $title2 "(not UTF-$bits)"    echo $title2 "(not UTF-$bits)"
447    for opt in "" "-s" $jitopt; do    for opt in "" "-s" $jitopt; do
448      $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput2 testtry      $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput2 testtry
449      if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
450        $cf $testdata/testoutput2 testtry        $cf $testdata/testoutput2 testtry
451        if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
# Line 504  if [ $do3 = yes ] ; then Line 508  if [ $do3 = yes ] ; then
508    if [ "$locale" != "" ] ; then    if [ "$locale" != "" ] ; then
509      echo $title3 "(using '$locale' locale)"      echo $title3 "(using '$locale' locale)"
510      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
511        $sim $valgrind ./pcretest -q $bmode $opt $infile testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $infile testtry
512        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
513          if $cf $outfile testtry >teststdout || \          if $cf $outfile testtry >teststdout || \
514             $cf $outfile2 testtry >teststdout || \             $cf $outfile2 testtry >teststdout || \
# Line 540  if [ $do4 = yes ] ; then Line 544  if [ $do4 = yes ] ; then
544      echo "  Skipped because UTF-$bits support is not available"      echo "  Skipped because UTF-$bits support is not available"
545    else    else
546      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
547        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput4 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput4 testtry
548        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
549          $cf $testdata/testoutput4 testtry          $cf $testdata/testoutput4 testtry
550          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 560  if [ $do5 = yes ] ; then Line 564  if [ $do5 = yes ] ; then
564      echo "  Skipped because UTF-$bits support is not available"      echo "  Skipped because UTF-$bits support is not available"
565    else    else
566      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
567        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput5 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput5 testtry
568        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
569          $cf $testdata/testoutput5 testtry          $cf $testdata/testoutput5 testtry
570          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 580  if [ $do6 = yes ] ; then Line 584  if [ $do6 = yes ] ; then
584      echo "  Skipped because Unicode property support is not available"      echo "  Skipped because Unicode property support is not available"
585    else    else
586      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
587        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput6 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput6 testtry
588        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
589          $cf $testdata/testoutput6 testtry          $cf $testdata/testoutput6 testtry
590          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 602  if [ $do7 = yes ] ; then Line 606  if [ $do7 = yes ] ; then
606      echo "  Skipped because Unicode property support is not available"      echo "  Skipped because Unicode property support is not available"
607    else    else
608      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
609        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput7 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput7 testtry
610        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
611          $cf $testdata/testoutput7 testtry          $cf $testdata/testoutput7 testtry
612          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 698  if [ $do12 = yes ] ; then Line 702  if [ $do12 = yes ] ; then
702    if [ $jit -eq 0 -o "$nojit" = "yes" ] ; then    if [ $jit -eq 0 -o "$nojit" = "yes" ] ; then
703      echo "  Skipped because JIT is not available or not usable"      echo "  Skipped because JIT is not available or not usable"
704    else    else
705      $sim $valgrind ./pcretest -q $bmode $testdata/testinput12 testtry      $sim $valgrind $vjs ./pcretest -q $bmode $testdata/testinput12 testtry
706      if [ $? = 0 ] ; then      if [ $? = 0 ] ; then
707        $cf $testdata/testoutput12 testtry        $cf $testdata/testoutput12 testtry
708        if [ $? != 0 ] ; then exit 1; fi        if [ $? != 0 ] ; then exit 1; fi
# Line 735  if [ "$do14" = yes ] ; then Line 739  if [ "$do14" = yes ] ; then
739      cp -f $testdata/saved16 testsaved16      cp -f $testdata/saved16 testsaved16
740      cp -f $testdata/saved32 testsaved32      cp -f $testdata/saved32 testsaved32
741      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
742        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput14 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput14 testtry
743        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
744          $cf $testdata/testoutput14 testtry          $cf $testdata/testoutput14 testtry
745          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 759  if [ "$do15" = yes ] ; then Line 763  if [ "$do15" = yes ] ; then
763      echo "  Skipped because UTF-$bits support is not available"      echo "  Skipped because UTF-$bits support is not available"
764    else    else
765      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
766        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput15 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput15 testtry
767        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
768          $cf $testdata/testoutput15 testtry          $cf $testdata/testoutput15 testtry
769          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 783  if [ $do16 = yes ] ; then Line 787  if [ $do16 = yes ] ; then
787      echo "  Skipped because Unicode property support is not available"      echo "  Skipped because Unicode property support is not available"
788    else    else
789      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
790        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput16 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput16 testtry
791        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
792          $cf $testdata/testoutput16 testtry          $cf $testdata/testoutput16 testtry
793          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 805  if [ $do17 = yes ] ; then Line 809  if [ $do17 = yes ] ; then
809      echo "  Skipped when running 8-bit tests"      echo "  Skipped when running 8-bit tests"
810    else    else
811      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
812        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput17 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput17 testtry
813        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
814          $cf $testdata/testoutput17 testtry          $cf $testdata/testoutput17 testtry
815          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 829  if [ $do18 = yes ] ; then Line 833  if [ $do18 = yes ] ; then
833      echo "  Skipped because UTF-$bits support is not available"      echo "  Skipped because UTF-$bits support is not available"
834    else    else
835      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
836        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput18 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput18 testtry
837        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
838          $cf $testdata/testoutput18-$bits testtry          $cf $testdata/testoutput18-$bits testtry
839          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi
# Line 853  if [ $do19 = yes ] ; then Line 857  if [ $do19 = yes ] ; then
857      echo "  Skipped because Unicode property support is not available"      echo "  Skipped because Unicode property support is not available"
858    else    else
859      for opt in "" "-s" $jitopt; do      for opt in "" "-s" $jitopt; do
860        $sim $valgrind ./pcretest -q $bmode $opt $testdata/testinput19 testtry        $sim $valgrind ${opt:+$vjs} ./pcretest -q $bmode $opt $testdata/testinput19 testtry
861        if [ $? = 0 ] ; then        if [ $? = 0 ] ; then
862          $cf $testdata/testoutput19 testtry          $cf $testdata/testoutput19 testtry
863          if [ $? != 0 ] ; then exit 1; fi          if [ $? != 0 ] ; then exit 1; fi

Legend:
Removed from v.1641  
changed lines
  Added in v.1642

  ViewVC Help
Powered by ViewVC 1.1.5