summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-04-09 12:15:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:54 -0500
commit892c8cd1b43178e7ba600f111289d5843826734e (patch)
treeb1340b08cf333681f985e729c99a0c72d1efef41
parentc0b76be62fda2c379c5a5b2e682de2929d0ba7dd (diff)
downloadsamba-892c8cd1b43178e7ba600f111289d5843826734e.tar.gz
samba-892c8cd1b43178e7ba600f111289d5843826734e.tar.bz2
samba-892c8cd1b43178e7ba600f111289d5843826734e.zip
r22137: Actually use client.conf, defer more code as far as possible.
(This used to be commit 9399123a7277dbaf8dd392dd4ec2fe1c0780d486)
-rwxr-xr-xsource4/script/tests/mktestdc.sh5
-rwxr-xr-xsource4/script/tests/selftest.pl35
2 files changed, 20 insertions, 20 deletions
diff --git a/source4/script/tests/mktestdc.sh b/source4/script/tests/mktestdc.sh
index ee4a99c8a3..fc495e7b57 100755
--- a/source4/script/tests/mktestdc.sh
+++ b/source4/script/tests/mktestdc.sh
@@ -83,7 +83,6 @@ cat >$CONFFILE<<EOF
server max protocol = SMB2
notify:inotify = false
ldb:nosync = true
-
system:anonymous = true
#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
@@ -273,8 +272,6 @@ $srcdir/bin/ldbadd -H $PRIVATEDIR/wins_config.ldb < $PRIVATEDIR/wins_config.ldif
echo "KRB5_CONFIG=$KRB5_CONFIG"
echo "PREFIX_ABS=$PREFIX_ABS"
-echo "CONFIGURATION=$CONFIGURATION"
-echo "CONFFILE=$CONFFILE"
echo "SLAPD_CONF=$SLAPD_CONF"
echo "PIDDIR=$PIDDIR"
echo "AUTH=$AUTH"
@@ -290,7 +287,9 @@ echo "PASSWORD=$PASSWORD"
echo "SRCDIR=$SRCDIR"
echo "PREFIX=$PREFIX"
echo "LDAPDIR=$LDAPDIR"
+echo "CONFFILE=$CONFFILE"
echo "PROVISION_OPTIONS=$PROVISION_OPTIONS"
echo "PROVISION_ACI=$PROVISION_ACI"
echo "WINBINDD_SOCKET_DIR=$WINBINDD_SOCKET_DIR"
echo "NCALRPCDIR=$NCALRPCDIR"
+echo "CONFIGURATION=$CONFIGURATION"
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 1b04e494ea..e056077b82 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -427,15 +427,6 @@ if (defined($opt_skip)) {
close(SKIP);
}
-my $testenv_vars = $target->setup_env("dc", "$prefix/dc", $socket_wrapper_dir);
-
-SocketWrapper::set_default_iface(6);
-
-foreach ("PASSWORD", "DOMAIN", "SERVER", "CONFIGURATION",
- "USERNAME", "NETBIOSNAME") {
- $ENV{$_} = $testenv_vars->{$_};
-}
-
my $interfaces = join(',', ("127.0.0.6/8",
"127.0.0.7/8",
"127.0.0.8/8",
@@ -443,33 +434,36 @@ my $interfaces = join(',', ("127.0.0.6/8",
"127.0.0.10/8",
"127.0.0.11/8"));
-
+my $testenv_vars = $target->setup_env("dc", "$prefix/dc", $socket_wrapper_dir);
my $conffile = "$prefix/client.conf";
+my $abs_srcdir = cwd();
open(CF, ">$conffile");
print CF "[global]\n";
if (defined($ENV{VALGRIND})) {
- print CF "iconv:native = true\n";
+ print CF "\ticonv:native = true\n";
} else {
- print CF "iconv:native = false\n";
+ print CF "\ticonv:native = false\n";
}
-print CF "
+print CF
+" netbios name = localtest
+ netbios aliases = localhost
workgroup = $testenv_vars->{DOMAIN}
realm = $testenv_vars->{REALM}
+ pid directory = $testenv_vars->{PIDDIR}
ncalrpc dir = $testenv_vars->{NCALRPCDIR}
- js include = $srcdir/scripting/libjs
+ js include = $abs_srcdir/scripting/libjs
winbindd socket directory = $testenv_vars->{WINBINDD_SOCKET_DIR}
name resolve order = bcast
interfaces = 127.0.0.1/8
- panic action = $srcdir/script/gdb_backtrace \%PID\% \%PROG\%
+ panic action = $abs_srcdir/script/gdb_backtrace \%PID\% \%PROG\%
max xmit = 32K
notify:inotify = false
ldb:nosync = true
system:anonymous = true
#We don't want to pass our self-tests if the PAC code is wrong
- torture:basedir = st
+ torture:basedir = ./st
gensec:require_pac = true
- pid directory = $testenv_vars->{PIDDIR}
";
close(CF);
@@ -486,9 +480,14 @@ push (@torture_options, "--option=torture:quick=yes") if ($opt_quick);
$ENV{TORTURE_OPTIONS} = join(' ', @torture_options);
print "OPTIONS $ENV{TORTURE_OPTIONS}\n";
+foreach ("PASSWORD", "DOMAIN", "SERVER", "USERNAME", "NETBIOSNAME") {
+ $ENV{$_} = $testenv_vars->{$_};
+}
+
my @todo = ();
my $testsdir = "$srcdir/script/tests";
+$ENV{CONFIGURATION} = "--configfile=$conffile";
if ($opt_quick) {
open(IN, "$testsdir/tests_quick.sh|");
@@ -520,6 +519,8 @@ delete $ENV{DOMAIN};
$ENV{KRB5_CONFIG} = $testenv_vars->{KRB5_CONFIG};
+SocketWrapper::set_default_iface(6);
+
if ($opt_testenv) {
$ENV{PIDDIR} = $testenv_vars->{PIDDIR};
my $term = ($ENV{TERM} or "xterm");