From 45cfecfc1e89c6648a8cf3ebaea7ca535920f69f Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Wed, 15 Jul 2020 05:02:29 +0100 Subject: [PATCH] tests/basic.sh: fix tests to work with xtrace (re: c5820aab) --- src/cmd/ksh93/tests/basic.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cmd/ksh93/tests/basic.sh b/src/cmd/ksh93/tests/basic.sh index 4ba3d4bd7..bd784de81 100755 --- a/src/cmd/ksh93/tests/basic.sh +++ b/src/cmd/ksh93/tests/basic.sh @@ -558,6 +558,7 @@ $SHELL 2> /dev/null -c $'for i;\ndo :;done' || err_exit 'for i ; not v result=$( TIMEFORMAT=$'\%3R' redirect 2>&1 + set +x time sleep .002 ) case $result in @@ -574,6 +575,7 @@ expect='0%' actual=$( TIMEFORMAT=$'%0S%' redirect 2>&1 + set +x time : ) [[ $actual == "$expect" ]] || err_exit "'%' is not treated literally when placed after a format specifier" \ @@ -584,12 +586,14 @@ us=$( LC_ALL='C.UTF-8' # radix point '.' TIMEFORMAT='%1U' # catch -1.99 bug as well by getting user time redirect 2>&1 + set +x time sleep 0 ) eu=$( LC_ALL='C_EU.UTF-8' # radix point ',' TIMEFORMAT='%1U' redirect 2>&1 + set +x time sleep 0 ) [[ ${us:1:1} == ${eu:1:1} ]] && err_exit "The time keyword ignores the locale's radix point (both are ${eu:1:1})"