summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-11 09:21:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:21 -0500
commitc87a08425cbb23df1909db3287073e834ce25491 (patch)
treef5f090a6265aba61644209197ef12162712011be /source4/script
parente96b2df638b12b2e85a311993c328d5251919279 (diff)
downloadsamba-c87a08425cbb23df1909db3287073e834ce25491.tar.gz
samba-c87a08425cbb23df1909db3287073e834ce25491.tar.bz2
samba-c87a08425cbb23df1909db3287073e834ce25491.zip
r18377: disable native iconv with valgrind
(This used to be commit d1ceb79d9d10a3fd7bdba935ef2d12db346051f4)
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/tests/mktestsetup.sh7
1 files changed, 7 insertions, 0 deletions
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