Skip to content

Commit 558a044

Browse files
committed
Splitting the running of the stty tests so that the mv test does not break the stty tests
1 parent d8eccd3 commit 558a044

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

util/run-gnu-test.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,15 @@ if test $# -ge 1; then
5555
fi
5656

5757
if [[ "$1" == "run-tty" ]]; then
58-
# Handle TTY tests - dynamically find tests requiring TTY
58+
# Handle TTY tests - dynamically find tests requiring TTY and run each individually
5959
shift
60-
TTY_TESTS=$(grep -r "require_controlling_input_terminal" tests --include="*.sh" --include="*.pl" -l 2>/dev/null | tr '\n' ' ')
61-
echo "Running TTY tests: $TTY_TESTS"
62-
script -qec "timeout -sKILL 1h '${MAKE}' -j '$(${NPROC})' check TESTS='$TTY_TESTS' SUBDIRS=. RUN_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit='' srcdir='${path_GNU}' TEST_SUITE_LOG='tests/test-suite-tty.log'" /dev/null || :
60+
TTY_TESTS=$(grep -r "require_controlling_input_terminal" tests --include="*.sh" --include="*.pl" -l 2>/dev/null)
61+
echo "Running TTY tests individually:"
62+
# If a test fails, it can break the implementation of the other tty tests. By running them seperately this stops the different tests from being able to break each other
63+
for test in $TTY_TESTS; do
64+
echo " Running: $test"
65+
script -qec "timeout -sKILL 5m '${MAKE}' check TESTS='$test' SUBDIRS=. RUN_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit='' srcdir='${path_GNU}'" /dev/null || :
66+
done
6367
exit 0
6468
elif [[ "$1" == "run-root" && "$has_selinux_tests" == true ]]; then
6569
# Handle SELinux root tests separately

0 commit comments

Comments
 (0)