From 04722950bb4ac202d62cd7ecdfe94357b73d8451 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Fri, 5 Jun 2020 04:01:08 +0200 Subject: [PATCH] tests/variables.sh: fix subshell error count, & another xtrace caught in comsub (cherry picked from commit 04b4aef0cf14d255ee27305f1458b34a1d3b8b6c) --- src/cmd/ksh93/tests/variables.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/ksh93/tests/variables.sh b/src/cmd/ksh93/tests/variables.sh index 8b344f493..34f4899df 100755 --- a/src/cmd/ksh93/tests/variables.sh +++ b/src/cmd/ksh93/tests/variables.sh @@ -660,7 +660,7 @@ set -- exit $Errors ) -Errors=$? # in case of failures, ensure error count survives subshell +let "Errors += $?" # ensure error count survives subshell cd $tmp @@ -676,7 +676,7 @@ do exp="$cmd ok" rm -f $cmd print print $exp > glean/$cmd chmod +x glean/$cmd - got=$(CDPATH=:.. $SHELL -c "PATH=:/bin:/usr/bin; date > /dev/null; cd glean && ./$cmd" 2>&1) + got=$(set +x; CDPATH=:.. $SHELL -c "PATH=:/bin:/usr/bin; date > /dev/null; cd glean && ./$cmd" 2>&1) [[ $got == "$exp" ]] || err_exit "cd with CDPATH after PATH change failed -- expected '$exp', got '$got'" done