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

[nmh] / test / install-mh / test-version-check

diff --git a/test/install-mh/test-version-check b/test/install-mh/test-version-check
index 406fc70a9a5b16bccfea43d6b40f9f7f31580a9e..07188e9ef3f65bdfc763421aaccb85a7074fcfe0 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -16,47 +16,11 @@ fi
 . "${MH_OBJ_DIR}/test/common.sh"
 
 setup_test
-
-require_prog script
+require_runpty_to_simulate_tty
 
 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"
-
-if script -S /bin/sh 'echo OK' /dev/null 2>&1 | egrep 'OK' >/dev/null; then
-    #### script(1) uses -S to set the shell that it runs.
-    use_dash_S=1
-else
-    #### Assume that script(1) uses SHELL environment variable.
-    use_dash_S=0
-fi
-
-#### Run a command but don't wait for user input.  script(1) seems to do
-#### what we want by not waiting when run in the background.  But 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}"
-
-    if [ ${use_dash_S} -eq 1 ]; then
-        script -S "${cmd}" "${actual}" >/dev/null &
-    else
-        SHELL="${cmd}" script "${actual}" >/dev/null &
-    fi
-
-    wait $!
-}
-
-#### Ensure that script(1) 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  &&  test -t 1  &&  test -t 2; then echo tty; fi'
-grep tty "${actual}" >/dev/null || test_skip "(script(1) doesn't simulate tty)"
-
 
 # Removing Version will trigger the welcome message.  (setup_test
 # inserted it so that other tests wouldn't show it.)
@@ -65,7 +29,7 @@ mv -f "${context}.NEW" "${context}"
 
 
 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
@@ -79,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.
-(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.
@@ -88,7 +52,7 @@ rm "${actual}"
 
 
 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
@@ -98,7 +62,7 @@ rm "${actual}"
 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
@@ -108,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}"
-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
@@ -117,7 +81,7 @@ rm "${actual}"
 
 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
@@ -126,7 +90,7 @@ rm "${actual}"
 
 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