Don't need to `else' after done() at end of then-block.

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

diff --git a/test/install-mh/test-version-check b/test/install-mh/test-version-check
index 8085a44579d7b5755f639de2459bf70e42a86571..2db8565b0a85836727077259ab78128eba7f64f9 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -6,7 +6,6 @@
 #
 ######################################################
 
 #
 ######################################################
 

-set -x # ???? debug on buildbot

 set -e
 
 if test -z "${MH_OBJ_DIR}"; then
 set -e
 
 if test -z "${MH_OBJ_DIR}"; then


@@ -18,104 +17,106 @@ fi
 
 setup_test
 
 
 setup_test
 

-require_prog script
-#### FreeBSD script, e.g., doesn't use -c to identify a command to run.
-if script -c 'echo OK' /dev/null 2>&1 | egrep 'OK' >/dev/null; then
-    script_command_opt='-c'
-else
-    script_command_opt=''
-fi
+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.  script(1) seems to do
-#### what we want by not waiting when run in the background.
+#### 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() {
 run_without_input() {

-    echo MHCONTEXT = $MHCONTEXT # ????
-    if [ "$script_command_opt" = -c ]; then
-        #### -c takes single argument with command + arguments.
-        script -q -f -c "$*" "$actual" >/dev/null &
-    else
-        #### E.g., FreeBSD.  Don't combine command arguments.
-        script -q -t 0 "$actual" "$@" >/dev/null &
-    fi
-
-    wait $!
+    #### Create a command to use as a shell for script.
+    cat >"${cmd}" <<EOF
+#! /bin/sh
+$*
+EOF
+    chmod +x "${cmd}"
+
+    "$runpty" "${actual}" "${cmd}"

 }
 
 }
 

-actual="$MH_TEST_DIR/test-version-check$$.actual"
-context="${MH_TEST_DIR}"/Mail/context
-version="Version: nmh-${MH_VERSION}"
+#### 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.)

-grep -v Version "$context" > "$context.NEW"
-mv -f "$context.NEW" "$context"
+grep -v Version "${context}" > "${context}.NEW"
+mv -f "${context}.NEW" "${context}"

 
 
 start_test 'mhparam skips the welcome message'
 run_without_input mhparam path
 
 
 start_test 'mhparam skips the welcome message'
 run_without_input mhparam path

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

-rm "$actual"
+rm "${actual}"

 
 
 start_test 'Welcome: disable in profile skips the welcome message'
 cp "${MH}" "${MH}-welcome"
 printf 'Welcome: disable\n' >> "${MH}-welcome"
 
 
 start_test 'Welcome: disable in profile skips the welcome message'
 cp "${MH}" "${MH}-welcome"
 printf 'Welcome: disable\n' >> "${MH}-welcome"

-(MH="${MH}-welcome" run_without_input pick last)
-grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
+# Run the function in subshell instead of augmenting the environment
+# 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)
+rm "${MH}-welcome"
+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
 # Make sure that version wasn't added to context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null  &&  false

-rm "$actual"
+rm "${actual}"

 
 
 start_test 'with welcome message'
 run_without_input pick last
 
 
 start_test 'with welcome message'
 run_without_input pick last

-cat "${MH_TEST_DIR}/Mail/context"; cat "$actual" # ????
-grep 'Welcome to nmh version ' "$actual" >/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
 # Make sure that version was added to context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null

-rm "$actual"
+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
 
 
 start_test 'without welcome message'
 # After running the previous test, this one should not have
 # the welcome message.
 run_without_input pick last

-grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
+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
 # Make sure that version is still in context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null

-rm "$actual"
+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}"

-cat "$MHCONTEXT" # ????

 run_without_input pick last
 run_without_input pick last

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

-rm "$actual"
+rm "${actual}"

 
 
 start_test "with MHCONTEXT doesn't welcome if newer"
 printf 'Version: nmh-10000.0\n' >"${MHCONTEXT}"
 run_without_input pick last
 
 
 start_test "with MHCONTEXT doesn't welcome if newer"
 printf 'Version: nmh-10000.0\n' >"${MHCONTEXT}"
 run_without_input pick last

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

-rm "$actual"
+rm "${actual}"

 
 
 start_test 'with MHCONTEXT but no version, no welcome and update'
 printf '' >"${MHCONTEXT}"
 run_without_input pick last
 
 
 start_test 'with MHCONTEXT but no version, no welcome and update'
 printf '' >"${MHCONTEXT}"
 run_without_input pick last

-grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
+grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false

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

-rm "$actual"
+rm "${actual}"

 
 
 finish_test
 
 
 finish_test

-exit $failed
+exit ${failed}