X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1f39b2d1b610c95e8bde939268c00f71a8e543ff..HEAD:/test/mkstemp/test-mkstemp

diff --git a/test/mkstemp/test-mkstemp b/test/mkstemp/test-mkstemp
index 992a5864..aec8baa8 100755
--- a/test/mkstemp/test-mkstemp
+++ b/test/mkstemp/test-mkstemp
@@ -19,13 +19,17 @@ setup_test
 expected="$MH_TEST_DIR"/$$.expected
 actual="$MH_TEST_DIR"/$$.actual
 
-mkstemp="${MH_LIB_DIR}/mkstemp"
+mkstemp="${MH_LIBEXEC_DIR}/mkstemp"
+
+check_exit '-eq 1' $mkstemp -
+
 $mkstemp -help | grep suffix >/dev/null  &&  has_mkstemps=1  ||  has_mkstemps=0
 
 cd "$MHTMPDIR"
 
 
 # check -help
+start_test "-help"
 if [ $has_mkstemps -eq 1 ]; then
     cat >$expected <<-'EOF'
 	Usage: mkstemp [switches]
@@ -47,11 +51,13 @@ else
 	EOF
 fi
 
-$mkstemp -h >$actual 2>&1
-check $expected $actual
+#### Skip nmh intro text.
+run_prog $mkstemp -h 2>&1 | sed '/^$/,$d' >"$actual"
+check "$expected" "$actual"
 
 
 # check -version
+start_test "-version"
 # Verified same behavior as compiled mhmail.
 case `$mkstemp -v` in
     mkstemp\ --*) ;;
@@ -61,6 +67,7 @@ esac
 
 
 # check with no switches
+start_test "with no switches"
 tmpfile=`$mkstemp`
 if [ -f "$tmpfile" ]; then
     rm "$tmpfile"
@@ -70,26 +77,32 @@ fi
 
 
 # check -directory
+start_test "-directory"
 tmpfile=`$mkstemp -directory "$MHTMPDIR"`
 [ -f "$tmpfile" ]  &&  rm "$tmpfile"  ||  failed=`expr ${failed:-0} + 1`
+# Rely on exit status of grep to detect failure and terminate due to set -e:
 check_tmpfile=`echo $tmpfile | grep "^$MHTMPDIR/......$" >/dev/null`
-run_test `echo $check_tmpfile` ''
+run_test 'eval echo $check_tmpfile' ''
 
 
 # check -prefix
+start_test "-prefix"
 tmpfile=`$mkstemp -prefix mkstemptest`
 [ -f "$tmpfile" ]  &&  rm "$tmpfile"  ||  failed=`expr ${failed:-0} + 1`
+# Rely on exit status of grep to detect failure and terminate due to set -e:
 check_tmpfile=`echo $tmpfile | grep '^mkstemptest......$' >/dev/null`
-run_test `echo $check_tmpfile` ''
+run_test 'eval echo $check_tmpfile' ''
 
 
 if [ $has_mkstemps -eq 1 ]; then
     # check -suffix
     tmpfile=`$mkstemp -suffix .txt`
     [ -f "$tmpfile" ]  &&  rm "$tmpfile"  ||  failed=`expr ${failed:-0} + 1`
+    # Rely on exit status of grep to detect failure and terminate due to set -e:
     check_tmpfile=`echo $tmpfile | grep '^......\.txt$' >/dev/null`
-    run_test `echo $check_tmpfile` ''
+    run_test 'eval echo $check_tmpfile' ''
 fi
 
 
+finish_test
 exit $failed