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 23446608fa569bf990e3c6591b9ea6dc2245f56a..095f09db949ecce49c2eaccc738e7b40166f6f00 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -31,10 +31,10 @@ fi
 run_without_input() {
     if [ "$script_command_opt" = -c ]; then
         #### -c takes single argument with command + arguments.
 run_without_input() {
     if [ "$script_command_opt" = -c ]; then
         #### -c takes single argument with command + arguments.

-        script -c "$*" -f -q "$actual" >/dev/null &
+        script -q -f -c "$*" "$actual" >/dev/null &

     else
         #### E.g., FreeBSD.  Don't combine command arguments.
     else
         #### E.g., FreeBSD.  Don't combine command arguments.

-        script -f -q "$actual" "$@" >/dev/null &
+        script -q -t 0 "$actual" "$@" >/dev/null &

     fi
 
     wait $!
     fi
 
     wait $!


@@ -70,6 +70,7 @@ 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" # ???? 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
 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