Delete mh_xfree(), changing callers to call free(3) instead.

[nmh] / test / inc / test-deb359167

diff --git a/test/inc/test-deb359167 b/test/inc/test-deb359167
index 0058a8ab67ba7e5917615c5342e8362a4ac408f3..225a2b4408d9eaaf0181791606263308de2bfb12 100755 (executable)
--- a/test/inc/test-deb359167
+++ b/test/inc/test-deb359167
@@ -3,22 +3,30 @@
 set -e
 
 if test -z "${MH_OBJ_DIR}"; then
 set -e
 
 if test -z "${MH_OBJ_DIR}"; then

-    srcdir=`dirname $0`/../..
-    MH_OBJ_DIR=`cd $srcdir && pwd`; export MH_OBJ_DIR
+    srcdir=`dirname "$0"`/../..
+    MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR

 fi
 
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 
 fi
 
 . "$MH_OBJ_DIR/test/common.sh"
 
 setup_test
 

+# valgrind throws a strange error on FreeBSD >= 10; skip the test
+# for now while we try to track down the underlying cause.
+if [ `uname -s` = 'FreeBSD' ]; then
+  case `uname -r` in
+    1?.*) test_skip 'valgrind fails on FreeBSD >= 10' ;;
+  esac
+fi
+

 require_prog valgrind
 
 THISDIR="$srcdir/test/inc"
 TESTMBOX="$THISDIR/deb359167.mbox"
 
 require_prog valgrind
 
 THISDIR="$srcdir/test/inc"
 TESTMBOX="$THISDIR/deb359167.mbox"
 

-if [ "$(output_md5 "$TESTMBOX" | cut -d ' ' -f 1)" != "e6ac458b8cccba2b2fd866fb505aeb5e" ]; then 
-  echo "Test mailbox has been corrupted"
-  exit 1
+if [ "`output_md5 "$TESTMBOX"`" != "e6ac458b8cccba2b2fd866fb505aeb5e" ]; then
+    echo "Test mailbox has been corrupted"
+    exit 1

 fi
 
 #
 fi
 
 #


@@ -28,4 +36,4 @@ fi
 
 chmod 755 ${MH_INST_DIR}${bindir}/inc
 
 
 chmod 755 ${MH_INST_DIR}${bindir}/inc
 

-valgrind --error-exitcode=1 --quiet inc -silent -file "$TESTMBOX"
+valgrind --error-exitcode=1 --quiet --suppressions="${srcdir}/test/valgrind.supp" inc -silent -file "$TESTMBOX"