Replace getcpy() with mh_xstrdup().

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

diff --git a/test/install-mh/test-install-mh b/test/install-mh/test-install-mh
index f8af2c9b9f4296c794bac3ff8a3dff92c6291e8b..46d01cd4caaaf09559d232a600a249db96b1d4db 100755 (executable)
--- a/test/install-mh/test-install-mh
+++ b/test/install-mh/test-install-mh
@@ -26,7 +26,7 @@ run_test "install-mh -auto" 'install-mh: invocation error'
 # check -check, with nmh already installed
 run_test "install-mh -check" ''
 # make sure exit status is 0
 # check -check, with nmh already installed
 run_test "install-mh -check" ''
 # make sure exit status is 0

-install-mh -check
+run_prog install-mh -check

 run_test "echo $?" '0'
 
 # Remove the nmh installation so that install-mh can install.
 run_test "echo $?" '0'
 
 # Remove the nmh installation so that install-mh can install.


@@ -36,7 +36,7 @@ rm -rf $MH_TEST_DIR/Mail
 run_test "install-mh -check" ''
 # make sure exit status is 1
 set +e
 run_test "install-mh -check" ''
 # make sure exit status is 1
 set +e

-install-mh -check
+run_prog install-mh -check

 run_test "echo $?" '1'
 set -e
 
 run_test "echo $?" '1'
 set -e
 


@@ -47,22 +47,22 @@ echo "n
 n
 n
 $installpath
 n
 n
 $installpath

-y" | install-mh >/dev/null
+y" | run_prog install-mh >/dev/null

 
 

-if [ -f $MH_TEST_DIR/Mail/context  -a  -f $MH_TEST_DIR/Mail/.mh_profile ]; then
-  install-mh -check
+if [ -f $MH_TEST_DIR/Mail/context  -a  -f "$MH" ]; then
+  run_prog install-mh -check

 else
   failed=`expr ${failed:-0} + 1`
 fi
 
 # Remove the nmh installation so that install-mh -auto can install.
 else
   failed=`expr ${failed:-0} + 1`
 fi
 
 # Remove the nmh installation so that install-mh -auto can install.

+# And set HOME to that it installs in the test directory:
+# install-mh -auto does a chdir($HOME).

 rm -rf $MH_TEST_DIR/Mail
 rm -rf $MH_TEST_DIR/Mail

-echo "n
-n
-$installpath" | install-mh -auto >/dev/null
+HOME=$MH_TEST_DIR install-mh -auto >/dev/null

 
 

-if [ -f $MH_TEST_DIR/Mail/context  -a  -f $MH_TEST_DIR/Mail/.mh_profile ]; then
-  install-mh -check
+if [ -f $MH_TEST_DIR/Mail/context  -a  -f "$MH" ]; then
+  run_prog install-mh -check

 else
   failed=`expr ${failed:-0} + 1`
 fi
 else
   failed=`expr ${failed:-0} + 1`
 fi