--- code/trunk/RunTest	2007/02/24 21:38:41	23
+++ code/tags/pcre-3.0/RunTest	2007/02/24 21:39:23	44
@@ -9,31 +9,34 @@
 do1=no
 do2=no
 do3=no
+do4=no
 
 while [ $# -gt 0 ] ; do
   case $1 in
     1) do1=yes;;
     2) do2=yes;;
     3) do3=yes;;
-    *) echo "Unknown test number $1"; exit 1;; 
+    4) do4=yes;;
+    *) echo "Unknown test number $1"; exit 1;;
   esac
   shift
 done
 
-if [ $do1 = no -a $do2 = no -a $do3 = no ] ; then
+if [ $do1 = no -a $do2 = no -a $do3 = no -a $do4 = no ] ; then
   do1=yes
   do2=yes
   do3=yes
-fi     
-          
+  do4=yes
+fi
+
 # Primary test, Perl-compatible
 
 if [ $do1 = yes ] ; then
   echo "Testing main functionality (Perl compatible)"
-  ./pcretest testinput testtry
-  if [ $? = 0 ] ; then 
-    $cf testtry testoutput
-    if [ $? != 0 ] ; then exit 1; fi 
+  ./pcretest testdata/testinput1 testtry
+  if [ $? = 0 ] ; then
+    $cf testtry testdata/testoutput1
+    if [ $? != 0 ] ; then exit 1; fi
   else exit 1
   fi
 fi
@@ -42,10 +45,10 @@
 
 if [ $do2 = yes ] ; then
   echo "Testing API and error handling (not Perl compatible)"
-  ./pcretest -i testinput2 testtry
-  if [ $? = 0 ] ; then 
-    $cf testtry testoutput2 
-    if [ $? != 0 ] ; then exit 1; fi 
+  ./pcretest -i testdata/testinput2 testtry
+  if [ $? = 0 ] ; then
+    $cf testtry testdata/testoutput2
+    if [ $? != 0 ] ; then exit 1; fi
   else exit 1
   fi
 fi
@@ -54,16 +57,38 @@
 
 if [ $do3 = yes ] ; then
   echo "Testing Perl 5.005 features (Perl 5.005 compatible)"
-  ./pcretest testinput3 testtry
-  if [ $? = 0 ] ; then 
-    $cf testtry testoutput3
-    if [ $? != 0 ] ; then exit 1; fi 
+  ./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
-  echo "Tests all ran OK"
-fi   
+  echo "The three main tests all ran OK"
+  echo " " 
+fi
+
+# Locale-specific tests, provided the "fr" locale is available
+
+if [ $do4 = yes ] ; then
+  locale -a | grep '^fr$' >/dev/null
+  if [ $? -eq 0 ] ; then
+    echo "Testing locale-specific features (using 'fr' locale)"
+    ./pcretest testdata/testinput4 testtry
+    if [ $? = 0 ] ; then
+      $cf testtry testdata/testoutput4
+      if [ $? != 0 ] ; then exit 1; fi
+      echo "Locale test ran OK" 
+      echo " " 
+    else exit 1
+    fi
+  else
+    echo "Cannot test locale-specific features - 'fr' locale not found,"
+    echo "or the \"locale\" command is not available to check for it."
+    echo " " 
+  fi
+fi
 
-# End    
+# End