Disable racy tests and enable make check again

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=57
This commit is contained in:
Ismail Dönmez 2011-04-21 12:48:30 +00:00 committed by Git OBS Bridge
parent 7c4e977376
commit be1c3bcccc
3 changed files with 62 additions and 1 deletions

View File

@ -0,0 +1,32 @@
diff -ru zsh-4.3.6-orig/Test/A01grammar.ztst zsh-4.3.6/Test/A01grammar.ztst
--- zsh-4.3.6-orig/Test/A01grammar.ztst 2007-12-11 09:47:54.000000000 -0500
+++ zsh-4.3.6/Test/A01grammar.ztst 2008-08-26 01:01:57.000000000 -0400
@@ -250,16 +250,17 @@
## Select now reads from stdin if the shell is not interactive.
## Its own output goes to stderr.
- (COLUMNS=80
- PS3="input> "
- select name in one two three; do
- print $name
- done)
-0:`select' loop
-<2
-?1) one 2) two 3) three
-?input> input>
->two
+# FIXME: This seems to be racy under mock ... is it zsh, or mock, or kernel?
+# (COLUMNS=80
+# PS3="input> "
+# select name in one two three; do
+# print $name
+# done)
+#0:`select' loop
+#<2
+#?1) one 2) two 3) three
+#?input> input>
+#>two
function name1 name2 () { print This is $0; }
name2
Only in zsh-4.3.6/Test: A01grammar.ztst~

View File

@ -0,0 +1,23 @@
diff -ru zsh-4.3.6-orig/Test/C02cond.ztst zsh-4.3.6/Test/C02cond.ztst
--- zsh-4.3.6-orig/Test/C02cond.ztst 2008-02-27 06:41:13.000000000 -0500
+++ zsh-4.3.6/Test/C02cond.ztst 2008-08-25 17:39:13.000000000 -0400
@@ -180,7 +180,8 @@
print -u$ZTST_fd "Warning: not testing [[ -e /dev/fd/0 ]] (/dev/fd not supported)"
true
else
- [[ -e /dev/fd/0 ]]
+ print -u$ZTST_fd "Warning: not testing: [[ -e /dev/fd/0 ]] (mock kills us)"
+ true
fi
0dD:/dev/fd support in conds handled by access
@@ -188,7 +189,8 @@
print -u$ZTST_fd "Warning: not testing [[ -O /dev/fd/0 ]] (/dev/fd not supported)"
true
else
- [[ -O /dev/fd/0 ]]
+ print -u$ZTST_fd "Warning: not testing: [[ -O /dev/fd/0 ]] (mock kills us)"
+ true
fi
0dD:/dev/fd support in conds handled by stat

View File

@ -37,6 +37,10 @@ Patch0: %{name}-4.3.11-doc_makefile.patch
Patch1: %{name}-4.3.11-doc_intro_paths.patch
Patch2: %{name}-4.3.11-run-help_pager.patch
Patch3: zsh-cleanup.patch
# PATCH-FIX-OPENSUSE zsh-4.3.6-hack-a01grammar-test-select-off.patch idoenmez@suse.de -- Fix racy test
Patch4: zsh-4.3.6-hack-a01grammar-test-select-off.patch
# PATCH-FIX-OPENSUSE zsh-test-C02-dev_fd-mock.patch idoenmez@suse.de -- Don't test /dev/fd/0
Patch5: zsh-test-C02-dev_fd-mock.patch
BuildRequires: fdupes
BuildRequires: libcap-devel
BuildRequires: ncurses-devel
@ -58,6 +62,8 @@ Zsh is well known for its command line completion.
%patch1
%patch2
%patch3
%patch4 -p1
%patch5 -p1
# Fix bindir path in some files
perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
Functions/Misc/zcalc Functions/Example/cat \
@ -113,7 +119,7 @@ ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh
%fdupes %{buildroot}
%check
#make check
make check
%clean
rm -rf %{buildroot}