Instead of relying on invo_name to decide whether to call

[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..3dfef0430c667615c1c19fc5961f79f6d6e18563 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -22,12 +22,24 @@ require_prog script
 actual="$MH_TEST_DIR/test-version-check$$.actual"
 context="${MH_TEST_DIR}"/Mail/context
 
 actual="$MH_TEST_DIR/test-version-check$$.actual"
 context="${MH_TEST_DIR}"/Mail/context
 

-
-start_test 'with welcome message'

 # Removing Version will trigger the welcome message.
 grep -v Version "$context" > "$context.NEW"
 mv -f "$context.NEW" "$context"
 # Removing Version will trigger the welcome message.
 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'
+# 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
+
+
+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
 grep 'Welcome to nmh version ' "$actual" >/dev/null
 rm "$actual"
 finish_test


@@ -36,7 +48,8 @@ finish_test
 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' -q "$actual" >/dev/null
+script -c 'pick last' -f -q "$actual" >/dev/null &
+wait $!

 grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
 rm "$actual"
 finish_test
 grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
 rm "$actual"
 finish_test