Commit b43528a1 authored by Timothy Sample's avatar Timothy Sample

Stabilize test suite

* test.sh: Increase test timeout from 1 to 10.
* Makefile.am (FULL_TESTS): Move tests/10-if-redirect.sh and
tests/100-cd.sh from here...
(BROKEN_TESTS): ...to here.
parent f93e294c
......@@ -209,7 +209,6 @@ FULL_TESTS = \
tests/10-if-test-false.sh \
tests/10-if-bracket.sh \
tests/10-if-bracket-false.sh \
tests/10-if-redirect.sh \
tests/11-for.sh \
tests/11-for-split-sequence.sh \
tests/11-for-done-subshell.sh \
......@@ -255,7 +254,6 @@ FULL_TESTS = \
tests/70-slash.sh \
tests/70-slash-string.sh \
tests/70-slash-string-slash.sh \
tests/100-cd.sh \
tests/100-cd-foo.sh \
tests/100-test.sh \
tests/100-test-file.sh \
......@@ -310,6 +308,13 @@ XFAIL_TESTS = \
tests/100-dirname-autoconf.sh \
tests/100-tar-Z-pipe.sh
# These tests will not be run. Put tests here
# that pass or fail based on environmental
# factors.
BROKEN_TESTS = \
tests/10-if-redirect.sh \
tests/100-cd.sh
EXTRA_DIST = \
scripts/geesh.in
......
......@@ -8,7 +8,7 @@ TEST_SHELL=${TEST_SHELL-scripts/gash}
t="$1"
b=tests/$(basename "$t" .sh)
set +e
timeout 1 $TEST_SHELL -e "$b".sh -s --long file0 file1 > "$b".1 2> "$b".2
timeout 10 $TEST_SHELL -e "$b".sh -s --long file0 file1 > "$b".1 2> "$b".2
r=$?
set -e
if [ -f "$b".exit ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment