.

OBS-URL: https://build.opensuse.org/package/show/shells/ksh?expand=0&rev=93
2012-02-09 14:17:14 +00:00 · 2012-02-09 14:17:14 +00:00 · 202eda382f
commit 202eda382f
parent 0bbff2ba96
2 changed files with 109 additions and 0 deletions
--- a/ksh.changes
+++ b/ksh.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb  9 14:14:53 UTC 2012 - werner@suse.de
+
+- Modify some tests of the test suite not to show false results on
+  highly loaded build hosts as well as on build shares mounted with
+  noatime option
+
 -------------------------------------------------------------------
 Thu Feb  9 09:47:38 UTC 2012 - werner@suse.de

--- a/ksh93.dif
+++ b/ksh93.dif
@ -179,6 +179,27 @@
 fi
 unset var
 typeset -b var
+--- src/cmd/ksh93/tests/bracket.sh
+++ src/cmd/ksh93/tests/bracket.sh	2012-02-09 14:11:32.365933854 +0000
+@@ -221,6 +221,10 @@ done
+ 	[[ abcdcdabcde == {5}(ab|cd)e ]] || err_exit 'abcdcdabcd == {5}(ab|cd)e'
+ ) || err_exit 'errors with {..}(...) patterns'
+ [[ D290.2003.02.16.temp == D290.+(2003.02.16).temp* ]] || err_exit 'pattern match bug with +(...)'
+atime=$(stat -c '%X' $file)
+sleep 2
+cat $file > /dev/null
+if [[ $atime -lt $(stat -c '%X' $file) ]] then
+ rm -rf $file
+ {
+ [[ -N $file ]] && err_exit 'test -N $tmp/*: st_mtime>st_atime after creat'
+@@ -231,6 +235,7 @@ sleep 2
+ read
+ [[ -N $file ]] && err_exit 'test -N $tmp/*: st_mtime>st_atime after read'
+ } > $file < $file
+fi
+ if	rm -rf "$file" && ln -s / "$file"
+ then	[[ -L "$file" ]] || err_exit '-L not working'
+ 	[[ -L "$file"/ ]] && err_exit '-L with file/ not working'
 --- src/cmd/ksh93/tests/builtins.sh
 +++ src/cmd/ksh93/tests/builtins.sh	2009-07-09 13:14:50.000000000 +0000
@@ -332,7 +332,7 @@ wait $pid1
@ -190,6 +211,87 @@
 v=$(getconf LIBPATH)
 for v in ${v//,/ }
 do	v=${v#*:}
+--- src/cmd/ksh93/tests/coprocess.sh
+++ src/cmd/ksh93/tests/coprocess.sh	2012-02-09 13:39:13.794169756 +0000
+@@ -107,15 +107,15 @@ ${SHELL-ksh} |&
+ cop=$!
+ exp=Done
+ print -p $'print hello | cat\nprint '$exp
+-read -t 5 -p
+-read -t 5 -p
+read -t 50 -p
+read -t 50 -p
+ got=$REPLY
+ if	[[ $got != $exp ]]
+ then	err_exit "${SHELL-ksh} coprocess io failed -- got '$got', expected '$exp'"
+ fi
+ exec 5<&p 6>&p
+ exec 5<&- 6>&-
+-{ sleep 4; kill $cop; } 2>/dev/null &
+{ sleep 10; kill $cop; } 2>/dev/null &
+ spy=$!
+ if	wait $cop 2>/dev/null
+ then	kill $spy 2>/dev/null
+@@ -128,10 +128,10 @@ echo line1 | grep 'line2'
+ echo line2 | grep 'line1'
+ } |&
+ SECONDS=0 count=0
+-while	read -p -t 10 line
+while	read -p -t 100 line
+ do	((count++))
+ done
+-if	(( SECONDS > 8 ))
+if	(( SECONDS > 80 ))
+ then	err_exit "read -p hanging (SECONDS=$SECONDS count=$count)"
+ fi
+ wait $!
+@@ -154,7 +154,7 @@ e=12345
+ 		wait $!
+ 	done
+ 	print
+-) 2>/dev/null | read -t 10 r
+) 2>/dev/null | read -t 100 r
+ [[ $r == $e ]] || err_exit "coprocess timing bug -- expected $e, got '$r'"
+ r=
+ (
+@@ -166,8 +166,9 @@ r=
+ 		wait $!
+ 	done
+ 	print $r
+-) 2>/dev/null | read -t 10 r
+) 2>/dev/null | read -t 100 r
+ [[ $r == $e ]] || err_exit "coprocess command substitution bug -- expected $e, got '$r'"
+kill $(jobs -p) 2>/dev/null
+ 
+ (
+ 	/bin/cat |&
+@@ -205,7 +206,7 @@ do	if	( trap - $sig ) 2> /dev/null
+ done
+ 
+ trap 'sleep_pid=; kill $pid; err_exit "coprocess 1 hung"' TERM
+-{ sleep 5; kill $$; } &
+{ sleep 10; kill $$; } &
+ sleep_pid=$!
+ builtin cat
+ cat |&
+@@ -220,7 +221,7 @@ trap - TERM
+ [[ $sleep_pid ]] && kill $sleep_pid
+ 
+ trap 'sleep_pid=; kill $pid; err_exit "coprocess 2 hung"' TERM
+-{ sleep 5; kill $$; } &
+{ sleep 10; kill $$; } &
+ sleep_pid=$!
+ cat |&
+ pid=$!
+@@ -232,7 +233,7 @@ trap - TERM
+ [[ $sleep_pid ]] && kill $sleep_pid
+ 
+ trap 'sleep_pid=; kill $pid; err_exit "coprocess 3 hung"' TERM
+-{ sleep 5; kill $$; } &
+{ sleep 10; kill $$; } &
+ sleep_pid=$!
+ cat |&
+ pid=$!
 --- src/cmd/ksh93/tests/locale.sh
 +++ src/cmd/ksh93/tests/locale.sh	2011-05-24 16:46:02.000000000 +0200
@@ -62,7 +62,7 @@ done