summary refs log tree commit diff
path: root/Test
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2016-12-06 21:32:14 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2016-12-06 21:32:14 -0800
commit88d12b809a9f2111bb99ae339af51d0b78d4357f (patch)
treef0b7041cfac52ae95fe9b2f42c6312ead963a34e /Test
parenta43e6e2db423930ccd0139a4263db64aa7875c00 (diff)
downloadzsh-88d12b809a9f2111bb99ae339af51d0b78d4357f.tar.gz
zsh-88d12b809a9f2111bb99ae339af51d0b78d4357f.tar.xz
zsh-88d12b809a9f2111bb99ae339af51d0b78d4357f.zip
40110: attempt to fix test failures on Solaris
B02typeset: ignore strerror text in test output, it differs by OS

C02cond: discard stderr when looking for a path to the "mount" command
Diffstat (limited to 'Test')
-rw-r--r--Test/B02typeset.ztst2
-rw-r--r--Test/C02cond.ztst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Test/B02typeset.ztst b/Test/B02typeset.ztst
index 9c56c7e5e..b27bb4f6b 100644
--- a/Test/B02typeset.ztst
+++ b/Test/B02typeset.ztst
@@ -720,4 +720,4 @@
 0:when cannot change UID, the command isn't run
 # 'date' did not run.
 >Status is printed, 1
-?(eval):2: failed to change user ID: operation not permitted
+*?*: failed to change user ID: *
diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
index 27a22593d..38525016c 100644
--- a/Test/C02cond.ztst
+++ b/Test/C02cond.ztst
@@ -146,7 +146,7 @@
 
 # can't be bothered with -S
 
-  if [[ ${mtab::="$({mount || /sbin/mount})"} = *[(]?*[)] ]]; then
+  if [[ ${mtab::="$({mount || /sbin/mount || /usr/sbin/mount} 2>/dev/null)"} = *[(]?*[)] ]]; then
     print -u $ZTST_fd 'This test takes two seconds...'
   else
     unmodified_ls="$(ls -lu $unmodified)"