Don't `else' after goto. Simplify control flow.

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

diff --git a/test/install-mh/test-version-check b/test/install-mh/test-version-check
index 3dfef0430c667615c1c19fc5961f79f6d6e18563..e9a2ce7463df34cd8340b8a2e16b4e3810478f56 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -19,40 +19,131 @@ setup_test
 
 require_prog script
 
 
 require_prog script
 

-actual="$MH_TEST_DIR/test-version-check$$.actual"
+actual="${MH_TEST_DIR}/test-version-check$$.actual"

 context="${MH_TEST_DIR}"/Mail/context
 context="${MH_TEST_DIR}"/Mail/context

+version="Version: nmh-${MH_VERSION}"
+cmd="${MH_TEST_DIR}/Mail/cmd"

 
 

-# Removing Version will trigger the welcome message.
-grep -v Version "$context" > "$context.NEW"
-mv -f "$context.NEW" "$context"
+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
+    cat >"${cmd}" <<EOF
+#! /bin/sh
+echo OK
+EOF
+    chmod +x "${cmd}"
+
+    (SHELL="${cmd}"; export SHELL; script "${actual}" >/dev/null &
+     wait $!)
+    if grep OK "${actual}" >/dev/null; then
+        #### script(1) supports SHELL environment variable.
+        use_dash_S=0
+    else
+        test_skip "can't find mechanism to set SHELL for script(1)"
+    fi
+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  -a  -t 1  -a  -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.)
+grep -v Version "${context}" > "${context}.NEW"
+mv -f "${context}.NEW" "${context}"

 
 
 start_test 'mhparam skips the welcome message'
 
 
 start_test 'mhparam skips the welcome message'

-# The command will wait for the user to hit return.  script seems to do what
-# we want by not waiting when run in the background.
-script -c 'mhparam path last' -f -q "$actual" >/dev/null &
-wait $!
-grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
-rm "$actual"
-finish_test
+run_without_input 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
+rm "${actual}"
+
+
+start_test 'Welcome: disable in profile skips the welcome message'
+cp "${MH}" "${MH}-welcome"
+printf 'Welcome: disable\n' >> "${MH}-welcome"
+# 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
+rm "${actual}"

 
 
 start_test 'with welcome message'
 
 
 start_test 'with welcome message'

-script -c 'pick last' -f -q "$actual" >/dev/null &
-wait $!
-grep 'Welcome to nmh version ' "$actual" >/dev/null
-rm "$actual"
-finish_test
+run_without_input 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
+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.

-script -c 'pick last' -f -q "$actual" >/dev/null &
-wait $!
-grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
-rm "$actual"
-finish_test
+run_without_input 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
+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
+grep 'Welcome to nmh version ' "${actual}" >/dev/null
+# And make sure that version did get updated in context.
+grep "^${version}$" "${MHCONTEXT}" >/dev/null
+rm "${actual}"

 
 
 
 

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