[Pcre-svn] [712] code/trunk: Allow for CRLF terminations of …

Revision: 712

          http://vcs.pcre.org/viewvc?view=rev&revision=712
Author:   ph10
Date:     2011-09-26 17:31:42 +0100 (Mon, 26 Sep 2011)

Log Message:
-----------
Allow for CRLF terminations of pcretest output in RunTest.

Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/RunTest

Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2011-09-25 11:04:33 UTC (rev 711)
+++ code/trunk/ChangeLog    2011-09-26 16:31:42 UTC (rev 712)
@@ -65,6 +65,13 @@
     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

Modified: code/trunk/RunTest
===================================================================
--- code/trunk/RunTest    2011-09-25 11:04:33 UTC (rev 711)
+++ code/trunk/RunTest    2011-09-26 16:31:42 UTC (rev 712)
@@ -88,12 +88,15 @@
   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 @@
       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