--- code/trunk/RunTest.in	2007/02/24 21:39:42	53
+++ code/trunk/RunTest.in	2007/02/24 21:40:03	63
@@ -15,7 +15,6 @@
 do3=no
 do4=no
 do5=no
-do6=no
 
 while [ $# -gt 0 ] ; do
   case $1 in
@@ -24,31 +23,29 @@
     3) do3=yes;;
     4) do4=yes;;
     5) do5=yes;; 
-    6) do6=yes;; 
     *) echo "Unknown test number $1"; exit 1;;
   esac
   shift
 done
 
 if [ "@UTF8@" = "" ] ; then
-  if [ $do5 = yes ] ; then
-    echo "Can't run test 5 because UFT8 support is not configured"
+  if [ $do4 = yes ] ; then
+    echo "Can't run test 4 because UFT8 support is not configured"
     exit 1
   fi   
-  if [ $do6 = yes ] ; then
-    echo "Can't run test 6 because UFT8 support is not configured"
+  if [ $do5 = yes ] ; then
+    echo "Can't run test 5 because UFT8 support is not configured"
     exit 1
   fi   
 fi    
 
 if [ $do1 = no -a $do2 = no -a $do3 = no -a $do4 = no -a\
-     $do5 = no -a $do6 = no ] ; then
+     $do5 = no ] ; then
   do1=yes
   do2=yes
   do3=yes
-  do4=yes
+  if [ "@UTF8@" != "" ] ; then do4=yes; fi
   if [ "@UTF8@" != "" ] ; then do5=yes; fi
-  if [ "@UTF8@" != "" ] ; then do6=yes; fi
 fi
 
 # Primary test, Perl-compatible
@@ -59,6 +56,7 @@
   if [ $? = 0 ] ; then
     $cf testtry $testdata/testoutput1
     if [ $? != 0 ] ; then exit 1; fi
+    echo " " 
   else exit 1
   fi
 fi
@@ -75,33 +73,21 @@
   fi
 fi
 
-# Additional Perl-compatible tests for Perl 5.005's new features
-
-if [ $do3 = yes ] ; then
-  echo "Testing Perl 5.005 features (Perl 5.005 compatible)"
-  ./pcretest $testdata/testinput3 testtry
-  if [ $? = 0 ] ; then
-    $cf testtry $testdata/testoutput3
-    if [ $? != 0 ] ; then exit 1; fi
-  else exit 1
-  fi
-fi
-
-if [ $do1 = yes -a $do2 = yes -a $do3 = yes ] ; then
+if [ $do1 = yes -a $do2 = yes ] ; then
   echo " " 
-  echo "The three main tests all ran OK"
+  echo "The two main tests ran OK"
   echo " " 
 fi
 
 # Locale-specific tests, provided the "fr" locale is available
 
-if [ $do4 = yes ] ; then
+if [ $do3 = yes ] ; then
   locale -a | grep '^fr$' >/dev/null
   if [ $? -eq 0 ] ; then
     echo "Testing locale-specific features (using 'fr' locale)"
-    ./pcretest $testdata/testinput4 testtry
+    ./pcretest $testdata/testinput3 testtry
     if [ $? = 0 ] ; then
-      $cf testtry $testdata/testoutput4
+      $cf testtry $testdata/testoutput3
       if [ $? != 0 ] ; then 
         echo " "
         echo "Locale test did not run entirely successfully."
@@ -122,11 +108,11 @@
 
 # Additional tests for UTF8 support
 
-if [ $do5 = yes ] ; then
-  echo "Testing experimental, incomplete UTF8 support (Perl compatible)"
-  ./pcretest $testdata/testinput5 testtry 
+if [ $do4 = yes ] ; then
+  echo "Testing UTF-8 support (Perl compatible)"
+  ./pcretest $testdata/testinput4 testtry 
   if [ $? = 0 ] ; then
-    $cf testtry $testdata/testoutput5
+    $cf testtry $testdata/testoutput4
     if [ $? != 0 ] ; then exit 1; fi
   else exit 1
   fi
@@ -134,11 +120,11 @@
   echo " "
 fi
 
-if [ $do6 = yes ] ; then
-  echo "Testing API and internals for UTF8 support (not Perl compatible)"
-  ./pcretest $testdata/testinput6 testtry 
+if [ $do5 = yes ] ; then
+  echo "Testing API and internals for UTF-8 support (not Perl compatible)"
+  ./pcretest $testdata/testinput5 testtry 
   if [ $? = 0 ] ; then
-    $cf testtry $testdata/testoutput6
+    $cf testtry $testdata/testoutput5
     if [ $? != 0 ] ; then exit 1; fi
   else exit 1
   fi