1) Use script(1) -t 0 instead of -f on FreeBSD.

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

diff --git a/test/install-mh/test-version-check b/test/install-mh/test-version-check
index b8a91b683ef642418a76f336c7dd333d4901f63f..095f09db949ecce49c2eaccc738e7b40166f6f00 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -6,6 +6,7 @@
 #
 ######################################################
 
+set -x # ???? debug on buildbot
 set -e
 
 if test -z "${MH_OBJ_DIR}"; then
@@ -18,28 +19,101 @@ fi
 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
+
+#### 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_without_input() {
+    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 $!
+}
 
 actual="$MH_TEST_DIR/test-version-check$$.actual"
 context="${MH_TEST_DIR}"/Mail/context
+version="Version: nmh-${MH_VERSION}"
 
-
-start_test 'with welcome message'
-# Removing Version will trigger the welcome message.
+# 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"
-script -c 'pick last' -q "$actual" >/dev/null
+
+
+start_test 'mhparam skips the welcome message'
+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"
+(MH="${MH}-welcome" run_without_input pick last)
+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'
+run_without_input pick last
+cat "${MH_TEST_DIR}/Mail/context"; cat "$actual" # ???? debug
 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"
-finish_test
 
 
 start_test 'without welcome message'
 # After running the previous test, this one should not have
 # the welcome message.
-script -c 'pick last' -q "$actual" >/dev/null
+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"
-finish_test
 
 
+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