about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Test/V07pcre.ztst6
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 529d25293..bbe820cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-26  Phil Pennock  <pdpennock@users.sourceforge.net>
+
+	* 29867: Bart Schaefer: Test/V07pcre.ztst: exit early with
+	unimplemented status if zsh/pcre not available; combined with
+	Peter's 29865 fix, should make PCRE testing robust.
+
 2011-10-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 29844, 29845: Src/exec.c, Test/A04redirect.ztst: remove bogus
@@ -15511,5 +15517,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5487 $
+* $Revision: 1.5488 $
 *****************************************************
diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
index 4dd173557..f5b05deaa 100644
--- a/Test/V07pcre.ztst
+++ b/Test/V07pcre.ztst
@@ -1,6 +1,10 @@
 %prep
 
-  zmodload zsh/pcre
+  if ! zmodload zsh/pcre 2>/dev/null
+  then
+    ZTST_unimplemented="the zsh/pcre module is not available"
+    return 0
+  fi
   setopt rematch_pcre
 # Find a UTF-8 locale.
   setopt multibyte