summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2017-03-03 10:20:09 +0000
committerPeter Stephenson <pws@zsh.org>2017-03-03 10:20:16 +0000
commitefe5e6a2f035d368b62c04b559e78393e0e5322d (patch)
treebb4f36d3e4ebbcc8f50b24b8012349f09794590f
parent67c5d83df33cf46e5bf0d2f90bbc0f994e93f938 (diff)
downloadzsh-efe5e6a2f035d368b62c04b559e78393e0e5322d.tar.gz
zsh-efe5e6a2f035d368b62c04b559e78393e0e5322d.zip
40173: No error on failure to load zsh/db/gdbm in test.
This is a soft error causing the test to be skipped, with a report to that effect.
-rw-r--r--ChangeLog3
-rw-r--r--Test/V11db_gdbm.ztst2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d4be9f622..e7853f874 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2017-03-03 Peter Stephenson <p.stephenson@samsung.com>
+ * 40173: Test/V11db_gdbm.ztst: don't report an error if gdbm
+ module doesn't load as this simply causes the test to be skipped.
+
* 40702: Doc/Zsh/zle.yo, Src/Zle/zle_params.c: add
KEYS_QUEUED_COUNT variable to ZLE parameters.
diff --git a/Test/V11db_gdbm.ztst b/Test/V11db_gdbm.ztst
index 486ad4802..1d80f28f8 100644
--- a/Test/V11db_gdbm.ztst
+++ b/Test/V11db_gdbm.ztst
@@ -4,7 +4,7 @@
modname="zsh/db/gdbm"
dbfile=db.gdbm
- if ! zmodload $modname ; then
+ if ! zmodload $modname 2>/dev/null; then
ZTST_unimplemented="can't load $modname module for testing"
fi
rm -f db.gdbm