Allow for CRLF terminations of pcretest output in RunTest.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@712 2f5784b3-3f2a-0410-8824-cb99058d5e15

2 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f042df0..657ffbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,13 @@ Version 8.20 23-Sep-2011
     pattern contains any instances of (*THEN). If it does not, the old
     optimizations are restored. It would be nice to do this on a per-group
     basis, but at the moment that is not feasible.
+    
+12. In some environments, the output of pcretest -C is CRLF terminated. This
+    broke RunTest's code that checks for the link size. A single white space
+    after the value is now allowed for.
+    
+13. RunTest now checks for the "fr" locale as well as for "fr_FR" and "french".
+    For "fr", it uses the Windows-specific input and output files. 
 
 
 Version 8.13 16-Aug-2011
diff --git a/RunTest b/RunTest
index e5c33dc..3a5a9db 100755
--- a/RunTest
+++ b/RunTest
@@ -88,12 +88,15 @@ else
   exit 1
 fi
 
-# Find which optional facilities are available
+# 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.
 
 case `$sim ./pcretest -C | $sim ./pcregrep 'Internal link size'` in
-  *2) link_size=2;;
-  *3) link_size=3;;
-  *4) link_size=4;;
+  *2|*2[[:space:]]) link_size=2;;
+  *3|*3[[:space:]]) link_size=3;;
+  *4|*4[[:space:]]) link_size=4;;
    *) echo "Failed to find internal link size"; exit 1;;
 esac
 
@@ -294,8 +297,8 @@ if [ $do3 = yes ] ; then
       fi
     done
   else
-    echo "Cannot test locale-specific features - neither the 'fr_FR' nor the"
-    echo "'french' locale exists, or the \"locale\" command is not available"
+    echo "Cannot test locale-specific features - none of the 'fr_FR', 'fr' or"
+    echo "'french' locales exist, or the \"locale\" command is not available"
     echo "to check for them."
     echo " "
   fi