Moved run_without_input() from test-version-check to common.sh.in.

diff --git a/test/common.sh.in b/test/common.sh.in
index 0cb64cc..d3875a3 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -281,6 +281,36 @@ run_test() {
   fi
 }
 
   fi
 }
 

+#### Run a command but don't wait for user input.  We switched from script(1)
+#### to our own utility, runpty.  Check that it makes the command look like
+#### it's connected to a terminal below.
+#### The single argument is the name of the file in which to place the output.
+run_without_input() {
+    actual=$1
+    shift
+    runpty="${MH_OBJ_DIR}/test/runpty"
+
+    #### Create a command to use as a shell for script.
+    cmd="${MH_TEST_DIR}/Mail/cmd"
+    cat >"${cmd}" <<EOF
+#! /bin/sh
+$*
+EOF
+    chmod +x "${cmd}"
+
+    "${runpty}" "${actual}" "${cmd}"
+}
+
+#### Ensure that runpty makes the program look like it's connected to a
+#### terminal.  The welcome message code in sbr/utils.c needs that.
+require_runpty_to_simulate_tty() {
+  actual="${MH_TEST_DIR}/test-runpty"
+  run_without_input "${actual}" \
+                    'if test -t 0  -a  -t 1  -a  -t 2; then echo tty; fi'
+  grep tty "${actual}" >/dev/null || test_skip "runpty doesn't simulate tty"
+  rm -f "$actual"
+}
+

 #### check_exit() runs the command in $2..., capturing stdout and
 #### stderr, and then tests its exit status with the test(1) condition
 #### in $1.  If that fails, the captured stdout and stderr are
 #### check_exit() runs the command in $2..., capturing stdout and
 #### stderr, and then tests its exit status with the test(1) condition
 #### in $1.  If that fails, the captured stdout and stderr are

diff --git a/test/install-mh/test-version-check b/test/install-mh/test-version-check
index 2db8565..07188e9 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -16,32 +16,11 @@ fi
 . "${MH_OBJ_DIR}/test/common.sh"
 
 setup_test
 . "${MH_OBJ_DIR}/test/common.sh"
 
 setup_test

+require_runpty_to_simulate_tty

 
 actual="${MH_TEST_DIR}/test-version-check$$.actual"
 context="${MH_TEST_DIR}"/Mail/context
 version="Version: nmh-${MH_VERSION}"
 
 actual="${MH_TEST_DIR}/test-version-check$$.actual"
 context="${MH_TEST_DIR}"/Mail/context
 version="Version: nmh-${MH_VERSION}"

-cmd="${MH_TEST_DIR}/Mail/cmd"
-runpty="${MH_OBJ_DIR}/test/runpty"
-
-#### Run a command but don't wait for user input.  We switched from script(1)
-#### to our own utility, runpty.  Check that it makes the command look like
-#### it's connected to a terminal below.
-run_without_input() {
-    #### Create a command to use as a shell for script.
-    cat >"${cmd}" <<EOF
-#! /bin/sh
-$*
-EOF
-    chmod +x "${cmd}"
-
-    "$runpty" "${actual}" "${cmd}"
-}
-
-#### Ensure that runpty makes the program look like it's connected to a
-#### terminal.  The welcome message code in sbr/utils.c needs that.
-run_without_input 'if test -t 0  -a  -t 1  -a  -t 2; then echo tty; fi'
-grep tty "${actual}" >/dev/null || test_skip "runpty doesn't simulate tty"
-

 
 # Removing Version will trigger the welcome message.  (setup_test
 # inserted it so that other tests wouldn't show it.)
 
 # Removing Version will trigger the welcome message.  (setup_test
 # inserted it so that other tests wouldn't show it.)


@@ -50,7 +29,7 @@ mv -f "${context}.NEW" "${context}"
 
 
 start_test 'mhparam skips the welcome message'
 
 
 start_test 'mhparam skips the welcome message'

-run_without_input mhparam path
+run_without_input "${actual}" mhparam path

 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # Make sure that version wasn't added to context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null  &&  false
 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # Make sure that version wasn't added to context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null  &&  false


@@ -64,7 +43,7 @@ printf 'Welcome: disable\n' >> "${MH}-welcome"
 # for a single command, so that the environment does not retain the
 # MH setting.  That can happen when run under distcheck, depending
 # on the user's shell.
 # for a single command, so that the environment does not retain the
 # MH setting.  That can happen when run under distcheck, depending
 # on the user's shell.

-(MH="${MH}-welcome"; run_without_input pick last)
+(MH="${MH}-welcome"; run_without_input "${actual}" pick last)

 rm "${MH}-welcome"
 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # Make sure that version wasn't added to context.
 rm "${MH}-welcome"
 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # Make sure that version wasn't added to context.


@@ -73,7 +52,7 @@ rm "${actual}"
 
 
 start_test 'with welcome message'
 
 
 start_test 'with welcome message'

-run_without_input pick last
+run_without_input "${actual}" pick last

 grep 'Welcome to nmh version ' "${actual}" >/dev/null
 # Make sure that version was added to context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null
 grep 'Welcome to nmh version ' "${actual}" >/dev/null
 # Make sure that version was added to context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null


@@ -83,7 +62,7 @@ rm "${actual}"
 start_test 'without welcome message'
 # After running the previous test, this one should not have
 # the welcome message.
 start_test 'without welcome message'
 # After running the previous test, this one should not have
 # the welcome message.

-run_without_input pick last
+run_without_input "${actual}" pick last

 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # Make sure that version is still in context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null
 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # Make sure that version is still in context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null


@@ -93,7 +72,7 @@ rm "${actual}"
 start_test 'with MHCONTEXT, welcome only if older'
 MHCONTEXT="${MH_TEST_DIR}/Mail/context2"; export MHCONTEXT
 printf 'Version: nmh-1.5\n' >"${MHCONTEXT}"
 start_test 'with MHCONTEXT, welcome only if older'
 MHCONTEXT="${MH_TEST_DIR}/Mail/context2"; export MHCONTEXT
 printf 'Version: nmh-1.5\n' >"${MHCONTEXT}"

-run_without_input pick last
+run_without_input "${actual}" pick last

 grep 'Welcome to nmh version ' "${actual}" >/dev/null
 # And make sure that version did get updated in context.
 grep "^${version}$" "${MHCONTEXT}" >/dev/null
 grep 'Welcome to nmh version ' "${actual}" >/dev/null
 # And make sure that version did get updated in context.
 grep "^${version}$" "${MHCONTEXT}" >/dev/null


@@ -102,7 +81,7 @@ rm "${actual}"
 
 start_test "with MHCONTEXT doesn't welcome if newer"
 printf 'Version: nmh-10000.0\n' >"${MHCONTEXT}"
 
 start_test "with MHCONTEXT doesn't welcome if newer"
 printf 'Version: nmh-10000.0\n' >"${MHCONTEXT}"

-run_without_input pick last
+run_without_input "${actual}" pick last

 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # And make sure that version didn't get updated in context.
 grep '^Version: nmh-10000.0$' "${MHCONTEXT}" >/dev/null
 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # And make sure that version didn't get updated in context.
 grep '^Version: nmh-10000.0$' "${MHCONTEXT}" >/dev/null


@@ -111,7 +90,7 @@ rm "${actual}"
 
 start_test 'with MHCONTEXT but no version, no welcome and update'
 printf '' >"${MHCONTEXT}"
 
 start_test 'with MHCONTEXT but no version, no welcome and update'
 printf '' >"${MHCONTEXT}"

-run_without_input pick last
+run_without_input "${actual}" pick last

 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # And make sure that version did get updated in context.
 grep "^${version}$" "${MHCONTEXT}" >/dev/null
 grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
 # And make sure that version did get updated in context.
 grep "^${version}$" "${MHCONTEXT}" >/dev/null