diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Test/V01zmodload.ztst | 2 | ||||
| -rw-r--r-- | Test/V07pcre.ztst | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 0f4c36dfc..bdaa3ae9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-03-26 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 45591 (Cf. 45587, 45620): Test/V01zmodload.ztst, + Test/V07pcre.ztst: In the test suite, centralize testing that + compiled modules can be loaded successfully. + 2020-03-26 Peter Stephenson <p.w.stephenson@ntlworld.com> * 45616: Src/loop.c, Test/A01grammar.ztst: Remove tokens diff --git a/Test/V01zmodload.ztst b/Test/V01zmodload.ztst index 0a7fbb651..daf49cd72 100644 --- a/Test/V01zmodload.ztst +++ b/Test/V01zmodload.ztst @@ -64,7 +64,7 @@ for m in $mods do - zmodload $m || mods[(r)$m]=() + zmodload $m || return $? done 0d:Test loading of all compiled modules diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst index ab67f3d80..15a0982c8 100644 --- a/Test/V07pcre.ztst +++ b/Test/V07pcre.ztst @@ -1,11 +1,10 @@ %prep - if grep '^name=zsh/pcre .* link=no ' $ZTST_testdir/../config.modules >/dev/null + if ! zmodload zsh/pcre 2>/dev/null; then then ZTST_unimplemented="the zsh/pcre module was disabled by configure (see config.modules)" return 0 fi - zmodload zsh/pcre setopt rematch_pcre # Find a UTF-8 locale. setopt multibyte |