external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

tests/variables.sh: fix ( echo $RANDOM & ) test (re: af6a32d1)

Browse source 
On slower systems it could fail with an arithmetic syntax error
because the output was verified before it had been written.

Also make another test xtrace-proof.
This commit is contained in:
Martijn Dekker 2021-05-03 18:12:39 +01:00
parent 6d54faf9f5
commit 33269cae61
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/cmd/ksh93/tests/variables.sh
View file

@ -60,9 +60,20 @@ rand2=$($SHELL -c 'RANDOM=1; (echo $RANDOM)')
# $RANDOM should be reseeded for the ( simple_command & ) optimization # $RANDOM should be reseeded for the ( simple_command & ) optimization
( echo $RANDOM & ) >r1 ( echo $RANDOM & ) >r1
( echo $RANDOM & ) >r2 ( echo $RANDOM & ) >r2
sleep .01 integer giveup=0
(( $(<r1) == $(<r2) )) && err_exit "Test 4: \$RANDOM seed in ( simple_command & ) doesn't change" \ trap '((giveup++))' USR1
"(both results are $(<r1))" (sleep 2; kill -s USR1 $$) &
while [[ ! -s r1 || ! -s r2 ]]
do ((giveup)) && break
done
if ((giveup))
then err_exit "Test 4: ( echo $RANDOM & ) does not write output"
else [[ $(<r1) == "$(<r2)" ]] && err_exit "Test 4: \$RANDOM seed in ( simple_command & ) doesn't change" \
"(both results are $(printf %q "$(<r1)"))"
fi
kill $! 2>/dev/null
trap - USR1
unset giveup
# Virtual subshells should not influence the parent shell's RANDOM sequence # Virtual subshells should not influence the parent shell's RANDOM sequence
RANDOM=456 RANDOM=456
exp="$RANDOM $RANDOM $RANDOM $RANDOM $RANDOM" exp="$RANDOM $RANDOM $RANDOM $RANDOM $RANDOM"
@ -1243,7 +1254,7 @@ Hi, I'm still a function! On line 6, my \$LINENO is 6
./lineno_autoload: line 9: \${bad\subst\in\main\script\on\line\9}: bad substitution ./lineno_autoload: line 9: \${bad\subst\in\main\script\on\line\9}: bad substitution
end: main script \$LINENO == 10" end: main script \$LINENO == 10"
got=$(FPATH=$tmp "$SHELL" ./lineno_autoload 2>&1) got=$(set +x; FPATH=$tmp "$SHELL" ./lineno_autoload 2>&1)
[[ $got == "$exp" ]] || err_exit 'Regression in $LINENO and/or error messages.' \ [[ $got == "$exp" ]] || err_exit 'Regression in $LINENO and/or error messages.' \
$'Diff follows:\n'"$(diff -u <(print -r -- "$exp") <(print -r -- "$got") | sed $'s/^/\t| /')" $'Diff follows:\n'"$(diff -u <(print -r -- "$exp") <(print -r -- "$got") | sed $'s/^/\t| /')"