Canonicalized MH_TEST_DIR, and replaced use of `pwd` with it, to

try to prevent test failures on fbsd10 test host.

diff --git a/test/common.sh.in b/test/common.sh.in
index fc92813..8977391 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -5,7 +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.
-test -z "$MH_TEST_DIR"  &&  MH_TEST_DIR="$MH_OBJ_DIR/test/testdir"
+#### Use the result of cd and pwd so that the result will agree
+#### with what getcwd(3) returns.
+test -z "$MH_TEST_DIR"  &&  MH_TEST_DIR=`cd "$MH_OBJ_DIR/test/testdir" && pwd`
 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 6e8c52a..716c2dd 100755 (executable)
--- a/test/mhstore/test-mhstore
+++ b/test/mhstore/test-mhstore
@@ -312,7 +312,7 @@ check "$expected" 7.txt.2 'keep first'
 
 # check -clobber never.  Its exit status is the number of files not overwritten.
 run_test 'mhstore -clobber never' \
-         "mhstore: will not overwrite `pwd`/7.txt with -clobber never"
+         "mhstore: will not overwrite $MH_TEST_DIR/Mail/7.txt with -clobber never"
 set +e
 mhstore -clobber never >/dev/null 2>&1
 run_test "echo $?" 1