> The branch, master has been updated > via c0de338394c9e2dd80a3ad06341fe95b1ea169ed (commit) > from 974ab9d2f9ffabe20fab687f7e63cb168570f7e5 (commit) > > http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master > > > - Log ----------------------------------------------------------------- > commit c0de338394c9e2dd80a3ad06341fe95b1ea169ed > Author: Jelmer Vernooij <[EMAIL PROTECTED]> > Date: Sun Oct 19 16:07:00 2008 +0200 > > Move Samba4-specific code out of selftest. > > ----------------------------------------------------------------------- > > Summary of changes: > selftest/selftest.pl | 35 ++++++++++++++++++++--------------- > source4/selftest/tests.sh | 23 +++++++++++++++++++++++ > 2 files changed, 43 insertions(+), 15 deletions(-) > > > Changeset truncated at 500 lines: > > diff --git a/selftest/selftest.pl b/selftest/selftest.pl > index ebb88dd..d1e9c8d 100755 > --- a/selftest/selftest.pl > +++ b/selftest/selftest.pl > @@ -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)) { > diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh > index 5f14890..b02b7bb 100755 > --- a/source4/selftest/tests.sh > +++ b/source4/selftest/tests.sh > @@ -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" > +
don't you need to export some of this shell variables into the environment? I think at least SMB_CONF_PATH should be exported. metze
