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