From c87a08425cbb23df1909db3287073e834ce25491 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 Sep 2006 09:21:58 +0000
Subject: r18377: disable native iconv with valgrind (This used to be commit
 d1ceb79d9d10a3fd7bdba935ef2d12db346051f4)

---
 source4/script/tests/mktestsetup.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source4/script/tests')

diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh
index bf13fd7e0f..f107f54ace 100755
--- a/source4/script/tests/mktestsetup.sh
+++ b/source4/script/tests/mktestsetup.sh
@@ -69,8 +69,15 @@ export PIDDIR
 rm -rf $PREFIX/*
 mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR $LDAPDIR/db
 
+if [ -z "$VALGRIND" ]; then
+    nativeiconv="true"
+else
+    nativeiconv="false"
+fi
+
 cat >$CONFFILE<<EOF
 [global]
+	iconv:native = $nativeiconv
 	netbios name = $NETBIOSNAME
         netbios aliases = $SERVER
 	workgroup = $DOMAIN
-- 
cgit