X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b90476d799a2580fbd69e13325c56be5d56e1396..73b87885541e6422e267fa88ba61b7a3133059e0:/test/install-mh/test-version-check

diff --git a/test/install-mh/test-version-check b/test/install-mh/test-version-check
index 8085a445..66e9076b 100755
--- 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
@@ -19,23 +18,28 @@ 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'
+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
-    script_command_opt=''
+    #### 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.
 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 &
+    #### 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
-        #### E.g., FreeBSD.  Don't combine command arguments.
-        script -q -t 0 "$actual" "$@" >/dev/null &
+        SHELL="${cmd}" script "$actual" >/dev/null &
     fi
 
     wait $!
@@ -44,6 +48,7 @@ run_without_input() {
 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"
 
 # Removing Version will trigger the welcome message.  (setup_test
 # inserted it so that other tests wouldn't show it.)
@@ -62,7 +67,12 @@ 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)
+# 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
@@ -71,7 +81,6 @@ rm "$actual"
 
 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
 # Make sure that version was added to context.
 grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null
@@ -91,7 +100,6 @@ 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}"
-cat "$MHCONTEXT" # ????
 run_without_input pick last
 grep 'Welcome to nmh version ' "$actual" >/dev/null
 # And make sure that version did get updated in context.