1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00

shtests: don't run pty tests with shcomp by default

The pty tests tests the interactive shell. Therefore, running them
through the script compiler is a waste of time.

Not only that, it is reported that the pty tests intermittently
fail with shcomp on some systems. This is not worth trying to fix.

src/cmd/ksh93/tests/shtests:
- Only run pty.sh with shcomp if -c/--compile was explicitly
  specified.
- Document the change.
This commit is contained in:
Martijn Dekker 2021-12-16 07:24:27 +01:00
parent 38aab428bb
commit 60e0687cec

View file

@ -8,7 +8,7 @@ valgrindflags='--xml=yes --log-file=/dev/null --track-origins=yes --read-var-inf
USAGE=$' USAGE=$'
[-s8? [-s8?
@(#)$Id: shtests (ksh 93u+m) 2021-03-23 $ @(#)$Id: shtests (ksh 93u+m) 2021-12-16 $
] ]
[-author?David Korn <dgk@research.att.com>] [-author?David Korn <dgk@research.att.com>]
[-author?Glenn Fowler <gsf@research.att.com>] [-author?Glenn Fowler <gsf@research.att.com>]
@ -18,8 +18,9 @@ USAGE=$'
[+NAME?shtests - ksh regression test harness] [+NAME?shtests - ksh regression test harness]
[+DESCRIPTION?\bshtests\b is the \bksh\b(1) regression test harness for [+DESCRIPTION?\bshtests\b is the \bksh\b(1) regression test harness for
\b$SHELL\b or \bksh\b if \bSHELL\b is not defined and exported. If \b$SHELL\b or \bksh\b if \bSHELL\b is not defined and exported. If
none of the \b--posix --utf8 --compile\b options are specified then none of the \b--posix\b \b--utf8\b \b--compile\b options are specified then
all three are enabled.] all three are enabled for most tests, whereas only \b--posix\b \b--utf8\b
are enabled for the \bpty\b tests for the interactive shell.]
[+INPUT FILES?\bshtests\b regression test files are shell scripts that [+INPUT FILES?\bshtests\b regression test files are shell scripts that
run in an environment controlled by \bshtests\b. An identification run in an environment controlled by \bshtests\b. An identification
message is printed before and after each test on the standard output. message is printed before and after each test on the standard output.
@ -400,7 +401,8 @@ do [[ $i == *.sh ]] || i+='.sh'
esac esac
done done
fi fi
if (( compile )) # Skip pty tests for shcomp, unless -c was explicitly specified (compile==2)
if [[ compile -gt 0 && ! ($u == pty && compile -lt 2) ]]
then c=$tmp/shcomp-$u.ksh then c=$tmp/shcomp-$u.ksh
o="$u(shcomp)" o="$u(shcomp)"
echo test $o begins ${time:+"at $(date +%Y-%m-%d+%H:%M:%S)"} echo test $o begins ${time:+"at $(date +%Y-%m-%d+%H:%M:%S)"}