From 42f9fb26710ad7556ff111cc653087a625315e11 Mon Sep 17 00:00:00 2001
From: Timothy Sample <samplet@ngyro.com>
Date: Sun, 16 Dec 2018 14:15:45 -0500
Subject: [PATCH] Stabilize test suite.

* test.sh: Increase test timeout from 1 to 10.
* Makefile.am (FULL_TESTS): Move tests/10-if-redirect.sh,
tests/50-redirect-space.sh, tests/50-redirect-sed.sh, and
tests/100-cd.sh from here...
(BROKEN_TESTS): ...to here.
---
 Makefile.am | 13 +++++++++----
 test.sh     |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6b2c818..b99712b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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                 \
@@ -237,12 +236,10 @@ FULL_TESTS =                                    \
   tests/50-iohere.sh                            \
   tests/50-iohere-builtin.sh                    \
   tests/50-redirect.sh                          \
-  tests/50-redirect-space.sh                    \
   tests/50-redirect-in.sh                       \
   tests/50-redirect-append.sh                   \
   tests/50-redirect-pipe.sh                     \
   tests/50-redirect-merge.sh                    \
-  tests/50-redirect-sed.sh                      \
   tests/50-redirect-in-out.sh                   \
   tests/60-function.sh                          \
   tests/60-function-at.sh                       \
@@ -255,7 +252,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 +306,15 @@ 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/50-redirect-sed.sh                      \
+  tests/50-redirect-space.sh                    \
+  tests/100-cd.sh
+
 EXTRA_DIST =                                    \
   scripts/geesh.in
 
diff --git a/test.sh b/test.sh
index d7ed957..8fa4fb8 100755
--- a/test.sh
+++ b/test.sh
@@ -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