From dc2bfeee26e8f0c72f44b71e7369ae851bac4854 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <danielsh@apache.org>
Date: Tue, 18 Sep 2018 23:15:01 +0000
Subject: 43493: Have V07pcre fail if PCRE was enabled by configure
 (config.modules) but failed to load for any reason.

---
 Test/V07pcre.ztst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Test')

diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
index 9feeb47fb..ab67f3d80 100644
--- a/Test/V07pcre.ztst
+++ b/Test/V07pcre.ztst
@@ -1,11 +1,10 @@
 %prep
 
-  if ! zmodload -F zsh/pcre C:pcre-match 2>/dev/null
+  if grep '^name=zsh/pcre .* link=no ' $ZTST_testdir/../config.modules >/dev/null
   then
-    ZTST_unimplemented="the zsh/pcre module is not available"
+    ZTST_unimplemented="the zsh/pcre module was disabled by configure (see config.modules)"
     return 0
   fi
-# Load the rest of the builtins
   zmodload zsh/pcre
   setopt rematch_pcre
 # Find a UTF-8 locale.
-- 
cgit 1.4.1