Use pwd -P to canonicalize MH_TEST_DIR.

diff --git a/test/common.sh.in b/test/common.sh.in
index 8977391..38f15c5 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -5,9 +5,9 @@
 #### The following variables are set by "make check".  Ensure
 #### that they are set here so that individual tests can be run
 #### outside of make.  Requires that MH_OBJ_DIR be set on entry.
 #### The following variables are set by "make check".  Ensure
 #### that they are set here so that individual tests can be run
 #### outside of make.  Requires that MH_OBJ_DIR be set on entry.

-#### Use the result of cd and pwd so that the result will agree
+#### Use the result of cd and pwd -P so that the result will agree

 #### with what getcwd(3) returns.
 #### with what getcwd(3) returns.

-test -z "$MH_TEST_DIR"  &&  MH_TEST_DIR=`cd "$MH_OBJ_DIR/test/testdir" && pwd`
+test -z "$MH_TEST_DIR" && MH_TEST_DIR=`cd "$MH_OBJ_DIR/test/testdir" && pwd -P`

 export MH_TEST_DIR
 test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
 test -z "$prefix"  &&  prefix=@prefix@
 export MH_TEST_DIR
 test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
 test -z "$prefix"  &&  prefix=@prefix@

diff --git a/test/mhstore/test-mhstore b/test/mhstore/test-mhstore
index 0c94dc0..716c2dd 100755 (executable)
--- a/test/mhstore/test-mhstore
+++ b/test/mhstore/test-mhstore
@@ -23,12 +23,6 @@ actual="$MH_TEST_DIR/test-mhstore$$.actual"
 actual_err="$MH_TEST_DIR/test-mhmail$$.actual_err"
 
 cd "$MH_TEST_DIR"
 actual_err="$MH_TEST_DIR/test-mhmail$$.actual_err"
 
 cd "$MH_TEST_DIR"

-# ???? debug
-echo MH_TEST_DIR=$MH_TEST_DIR
-echo 'PWD   ='$PWD
-echo 'pwd   ='`pwd`
-echo 'pwd -L='`pwd -L`
-echo 'pwd -P='`pwd -P`

 
 # check with no options and no current message
 run_test 'mhstore' 'mhstore: no cur message'
 
 # check with no options and no current message
 run_test 'mhstore' 'mhstore: no cur message'