sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Move Samba4-specific code out of selftest.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-19 16:07:00 +02:00
parent 974ab9d2f9
commit c0de338394
2 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
selftest/selftest.pl
View File

@ -588,24 +588,9 @@ sub write_clientconf($$)
close(CF);
}
my @torture_options = ();
push (@torture_options, "--configfile=$conffile");
# ensure any one smbtorture call doesn't run too long
push (@torture_options, "--maximum-runtime=$torture_maxtime");
push (@torture_options, "--target=$opt_target");
push (@torture_options, "--basedir=$prefix_abs");
push (@torture_options, "--option=torture:progress=no") unless ($opt_verbose);
push (@torture_options, "--format=subunit");
push (@torture_options, "--option=torture:quick=yes") if ($opt_quick);
$ENV{TORTURE_OPTIONS} = join(' ', @torture_options);
print "OPTIONS $ENV{TORTURE_OPTIONS}\n";
my @todo = ();
my $testsdir = "$srcdir/selftest";
$ENV{SMB_CONF_PATH} = "$conffile";
$ENV{CONFIGURATION} = "--configfile=$conffile";
my %required_envs = ();
@ -640,6 +625,26 @@ if ($#testlists == -1) {
die("No testlists specified");
}
$ENV{SELFTEST_PREFIX} = "$prefix_abs";
if ($opt_socket_wrapper) {
$ENV{SELFTEST_INTERFACES} = $interfaces;
} else {
$ENV{SELFTEST_INTERFACES} = "";
}
if ($opt_verbose) {
$ENV{SELFTEST_VERBOSE} = "1";
} else {
$ENV{SELFTEST_VERBOSE} = "";
}
if ($opt_quick) {
$ENV{SELFTEST_QUICK} = "1";
} else {
$ENV{SELFTEST_QUICK} = "";
}
$ENV{SELFTEST_TARGET} = $opt_target;
$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
$ENV{SELFTEST_CONFFILE} = $conffile;
my @available = ();
foreach my $fn (@testlists) {
foreach (read_testlist($fn)) {

23
source4/selftest/tests.sh
View File

@ -58,8 +58,31 @@ bin/smbtorture -V
samba4srcdir=.
samba4bindir=$samba4srcdir/bin
prefix_abs="$SELFTEST_PREFIX/s4client"
mkdir "$prefix_abs"
conffile="$SELFTEST_CONFFILE"
TORTURE_OPTIONS=""
TORTURE_OPTIONS="$TORTURE_OPTIONS --configfile=$conffile"
TORTURE_OPTIONS="$TORTURE_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME"
TORTURE_OPTIONS="$TORTURE_OPTIONS --target=$SELFTEST_TARGET"
TORTURE_OPTIONS="$TORTURE_OPTIONS --basedir=$prefix_abs"
if [ -n "$SELFTEST_VERBOSE" ]; then
TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:progress=no"
fi
TORTURE_OPTIONS="$TORTURE_OPTIONS --format=subunit"
if [ -n "$SELFTEST_QUICK" ]; then
TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:quick=yes"
fi
smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
echo "OPTIONS $TORTURE_OPTIONS"
SMB_CONF_PATH="$conffile"
CONFIGURATION="--configfile=$conffile"
# Simple tests for LDAP and CLDAP
for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do