r18377: disable native iconv with valgrind

(This used to be commit d1ceb79d9d10a3fd7bdba935ef2d12db346051f4)

diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh
index bf13fd7e0fb0fe2f428fe0e327185c0e53be76d9..f107f54ace58ad87d8e05933a8d3488660e2853a 100755 (executable)
--- 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