From eb3d3fb27a12a833868a65d840fbd61909a3f348 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 4 Mar 2007 23:55:43 +0000
Subject: r21689: Try to walk a bit more of the param/loadparm.c functions, as
 well as validating that we have a correct configuration before we even start
 testing.

Andrew Bartlett
(This used to be commit c399b20b44d396dea69ed81b7d80982611ed25e4)
---
 source4/script/tests/mktestsetup.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh
index 530d7c8b58..4c9a828315 100755
--- a/source4/script/tests/mktestsetup.sh
+++ b/source4/script/tests/mktestsetup.sh
@@ -130,9 +130,8 @@ cat >$CONFFILE<<EOF
 	ntvfs handler = simple
 
 [cifsposixtestshare]
-	read only = no
+	copy = simple
 	ntvfs handler = cifsposix   
-	path = $TMPDIR
 EOF
 
 ## Override default share.ldb file
@@ -244,6 +243,21 @@ export KRB5_CONFIG
 
 . `dirname $0`/mk-keyblobs.sh
 
+#Ensure the config file is valid before we start
+$srcdir/bin/testparm $CONFIGURATION -v --suppress-prompt >/dev/null 2>&1 || {
+    echo "">&2
+    echo "Failed to create configuration!" >&2
+    $srcdir/bin/testparm $CONFIGURATION  >&2
+    exit 1
+}
+
+( $srcdir/bin/testparm $CONFIGURATION -v --suppress-prompt --parameter-name="netbios name" --section-name=global 2> /dev/null | grep -i ^$NETBIOSNAME ) >/dev/null 2>&1 || {
+    echo "$?" >&2
+    $srcdir/bin/testparm $CONFIGURATION -v --suppress-prompt --parameter-name="netbios name" --section-name=global --suppress-prompt 2> /dev/null | grep -i ^$NETBIOSNAME >&2
+    echo "Failed to create configuration!" >&2
+    exit 1
+}
+
 PROVISION_OPTIONS="$CONFIGURATION --host-name=$NETBIOSNAME --host-ip=127.0.0.1"
 PROVISION_OPTIONS="$PROVISION_OPTIONS --quiet --domain $DOMAIN --realm $REALM"
 PROVISION_OPTIONS="$PROVISION_OPTIONS --adminpass $PASSWORD --root=$ROOT"
-- 
cgit