rpms/ksh
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix regression tests

Browse Source
This commit is contained in:
Michal Hlavinka 2010-11-26 11:45:52 +01:00
parent 91459d5627
commit 4e7626d192
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
expectedresults.log
View File

@ -1,6 +0,0 @@
builtins.sh[296]: printf "%T" nowTue Nov 23 07:50:27 GMT 2010 != Tue Nov 23 07:50:27 UTC 2010
test builtins failed [ 132 tests 1 error ]
builtins.sh[296]: printf "%T" nowTue Nov 23 07:50:27 GMT 2010 != Tue Nov 23 07:50:27 UTC 2010
test builtins(C.UTF-8) failed [ 132 tests 1 error ]
shcomp-builtins.ksh[296]: printf "%T" nowTue Nov 23 07:50:27 GMT 2010 != Tue Nov 23 07:50:27 UTC 2010
test builtins(shcomp) failed [ 132 tests 1 error ]

32
ksh-20100826-fixregr.patch
View File

@ -1,19 +1,23 @@
diff -up ksh-20101026/src/cmd/ksh93/tests/builtins.sh.fixregr ksh-20101026/src/cmd/ksh93/tests/builtins.sh diff -up ksh-20101122/src/cmd/ksh93/tests/builtins.sh.fixregr ksh-20101122/src/cmd/ksh93/tests/builtins.sh
--- ksh-20101026/src/cmd/ksh93/tests/builtins.sh.fixregr 2010-10-27 08:52:38.000000000 +0200 --- ksh-20101122/src/cmd/ksh93/tests/builtins.sh.fixregr 2010-10-27 08:52:38.000000000 +0200
+++ ksh-20101026/src/cmd/ksh93/tests/builtins.sh 2010-11-01 08:49:42.135892758 +0100 +++ ksh-20101122/src/cmd/ksh93/tests/builtins.sh 2010-11-26 10:17:05.653551931 +0100
@@ -293,7 +293,7 @@ fi @@ -291,9 +291,9 @@ then err_exit "printf '%..*s' not workin
fi
[[ $(printf '%q\n') == '' ]] || err_exit 'printf "%q" with missing arguments'
# we won't get hit by the one second boundary twice, right? # we won't get hit by the one second boundary twice, right?
[[ $(printf '%T\n' now) == "$(date)" ]] || -[[ $(printf '%T\n' now) == "$(date)" ]] ||
[[ $(printf '%T\n' now) == "$(date)" ]] || -[[ $(printf '%T\n' now) == "$(date)" ]] ||
-err_exit 'printf "%T" now' -err_exit 'printf "%T" now'
+err_exit 'printf "%T" now'"$(printf '%T\n' now) != $(date)" +[[ $(printf '%T\n' now | sed 's/GMT/UTC/') == "$(date)" ]] ||
+[[ $(printf '%T\n' now | sed 's/GMT/UTC/') == "$(date)" ]] ||
+err_exit 'printf "%T" now = '"$(printf '%T\n' now) != $(date)"
behead() behead()
{ {
read line read line
diff -up ksh-20101026/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20101026/src/cmd/ksh93/tests/locale.sh diff -up ksh-20101122/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20101122/src/cmd/ksh93/tests/locale.sh
--- ksh-20101026/src/cmd/ksh93/tests/locale.sh.fixregr 2010-10-26 12:12:34.000000000 +0200 --- ksh-20101122/src/cmd/ksh93/tests/locale.sh.fixregr 2010-11-13 01:29:23.000000000 +0100
+++ ksh-20101026/src/cmd/ksh93/tests/locale.sh 2010-11-01 09:37:38.719975976 +0100 +++ ksh-20101122/src/cmd/ksh93/tests/locale.sh 2010-11-26 10:08:17.334737934 +0100
@@ -105,6 +105,7 @@ if (( $($SHELL -c $'export LC_ALL='$loca @@ -104,6 +104,7 @@ if (( $($SHELL -c $'export LC_ALL='$loca
then LC_ALL=$locale $SHELL -c b1=$'"\342\202\254\342\202\254\342\202\254\342\202\254w\342\202\254\342\202\254\342\202\254\342\202\254"; [[ ${b1:4:1} == w ]]' || err_exit 'multibyte ${var:offset:len} not working correctly' then LC_ALL=$locale $SHELL -c b1=$'"\342\202\254\342\202\254\342\202\254\342\202\254w\342\202\254\342\202\254\342\202\254\342\202\254"; [[ ${b1:4:1} == w ]]' || err_exit 'multibyte ${var:offset:len} not working correctly'
fi fi
@ -21,7 +25,7 @@ diff -up ksh-20101026/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20101026/src/cmd
#$SHELL -c 'export LANG='$locale'; printf "\u[20ac]\u[20ac]" > $tmp/two_euro_chars.txt' #$SHELL -c 'export LANG='$locale'; printf "\u[20ac]\u[20ac]" > $tmp/two_euro_chars.txt'
printf $'\342\202\254\342\202\254' > $tmp/two_euro_chars.txt printf $'\342\202\254\342\202\254' > $tmp/two_euro_chars.txt
exp="6 2 6" exp="6 2 6"
@@ -112,11 +113,11 @@ set -- $($SHELL -c " @@ -111,11 +112,11 @@ set -- $($SHELL -c "
unset LC_CTYPE unset LC_CTYPE
export LANG=$locale export LANG=$locale
export LC_ALL=C export LC_ALL=C
@ -36,7 +40,7 @@ diff -up ksh-20101026/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20101026/src/cmd
") ")
got=$* got=$*
[[ $got == $exp ]] || err_exit "command wc LC_ALL default failed -- expected '$exp', got '$got'" [[ $got == $exp ]] || err_exit "command wc LC_ALL default failed -- expected '$exp', got '$got'"
@@ -135,6 +136,8 @@ set -- $($SHELL -c " @@ -134,6 +135,8 @@ set -- $($SHELL -c "
got=$* got=$*
[[ $got == $exp ]] || err_exit "builtin wc LC_ALL default failed -- expected '$exp', got '$got'" [[ $got == $exp ]] || err_exit "builtin wc LC_ALL default failed -- expected '$exp', got '$got'"
@ -45,7 +49,7 @@ diff -up ksh-20101026/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20101026/src/cmd
# multibyte char straddling buffer boundary # multibyte char straddling buffer boundary
{ {
@@ -191,6 +194,7 @@ do exp=$1 @@ -190,6 +193,7 @@ do exp=$1
done done
# setocale(LC_ALL,"") after setlocale() initialization # setocale(LC_ALL,"") after setlocale() initialization

3
ksh.spec
View File

@ -24,6 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Conflicts: pdksh Conflicts: pdksh
Requires: coreutils, glibc-common, diffutils Requires: coreutils, glibc-common, diffutils
BuildRequires: bison BuildRequires: bison
# regression test suite uses 'ps' from procps
BuildRequires: procps
Requires(post): grep, coreutils Requires(post): grep, coreutils
Requires(preun): grep, coreutils Requires(preun): grep, coreutils
@ -73,7 +75,6 @@ then
fi fi
$SHELL ./shtests 2>&1 | tee testresults.log $SHELL ./shtests 2>&1 | tee testresults.log
sed -e '/begins at/d' -e '/ 0 error/d' -e 's/at [^\[]*\[/\[/' testresults.log -e '/tests skipped/d' >filteredresults.log sed -e '/begins at/d' -e '/ 0 error/d' -e 's/at [^\[]*\[/\[/' testresults.log -e '/tests skipped/d' >filteredresults.log
exit 0
if ! cmp filteredresults.log %{SOURCE5} >/dev/null || ls core.* if ! cmp filteredresults.log %{SOURCE5} >/dev/null || ls core.*
then then
echo "Regression tests failed" echo "Regression tests failed"