shift 4
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
wbinfo="$VALGRIND $samba4bindir/wbinfo$EXEEXT"
. `dirname $0`/../../testprogs/blackbox/subunit.sh
selftest --help
-selftest [--srcdir=DIR] [--builddir=DIR] [--exeext=EXT][--target=samba4|samba3|win|kvm] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--testlist=FILE] [TESTS]
+selftest [--srcdir=DIR] [--bindir=DIR] [--exeext=EXT][--target=samba4|samba3|win|kvm] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--testlist=FILE] [TESTS]
=head1 DESCRIPTION
Source directory.
-=item I<--builddir=DIR>
+=item I<--bindir=DIR>
-Build directory.
+Built binaries directory.
=item I<--exeext=EXT>
my @testlists = ();
my $srcdir = ".";
-my $builddir = ".";
+my $bindir = "./bin";
my $exeext = "";
my $prefix = "./st";
Paths:
--prefix=DIR prefix to run tests in [st]
--srcdir=DIR source directory [.]
- --builddir=DIR output directory [.]
+ --bindir=DIR binaries directory [./bin]
--exeext=EXT executable extention []
Target Specific:
'exclude=s' => \@opt_exclude,
'include=s' => \@opt_include,
'srcdir=s' => \$srcdir,
- 'builddir=s' => \$builddir,
+ 'bindir=s' => \$bindir,
'exeext=s' => \$exeext,
'verbose' => \$opt_verbose,
'testenv' => \$opt_testenv,
# make all our python scripts unbuffered
$ENV{PYTHONUNBUFFERED} = 1;
-my $bindir = "$builddir/bin";
my $bindir_abs = abs_path($bindir);
# Backwards compatibility:
mkdir($tmpdir_abs, 0777) unless -d $tmpdir_abs;
my $srcdir_abs = abs_path($srcdir);
-my $builddir_abs = abs_path($builddir);
die("using an empty absolute prefix isn't allowed") unless $prefix_abs ne "";
die("using '/' as absolute prefix isn't allowed") unless $prefix_abs ne "/";
$ENV{PREFIX_ABS} = $prefix_abs;
$ENV{SRCDIR} = $srcdir;
$ENV{SRCDIR_ABS} = $srcdir_abs;
-$ENV{BUILDDIR} = $builddir;
$ENV{BINDIR} = $bindir_abs;
$ENV{EXEEXT} = $exeext;
return os.path.normpath(os.path.join(srcdir(), "source4"))
def bindir():
- return os.path.normpath(os.path.join(os.getenv("BUILDDIR", "."), "bin"))
+ return os.path.normpath(os.getenv("BINDIR", "./bin"))
def binpath(name):
return os.path.join(bindir(), "%s%s" % (name, os.getenv("EXEEXT", "")))
if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then
( rm -f ${SELFTESTPREFIX}/st_done && \
${PERL} ${SELFTESTDIR}/selftest.pl \
- --builddir=. --prefix=${SELFTESTPREFIX} --target=samba3 \
+ --prefix=${SELFTESTPREFIX} --target=samba3 \
--testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \
--exclude=${SOURCEDIR}/selftest/skip \
--srcdir="${SOURCEDIR}/.." \
else
( rm -f ${SELFTESTPREFIX}/st_done && \
${PERL} ${SELFTESTDIR}/selftest.pl \
- --builddir=. --prefix=${SELFTESTPREFIX} --target=samba3 \
+ --prefix=${SELFTESTPREFIX} --target=samba3 \
--testlist="${PYTHON} ${SOURCEDIR}/selftest/tests.py|" \
--exclude=${SOURCEDIR}/selftest/skip \
--srcdir="${SOURCEDIR}/.." \
os.makedirs(env.SELFTEST_PREFIX, int('755', 8))
# We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
- cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=samba3 --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=${srcdir} --exclude=${srcdir}/source3/selftest/skip --testlist="${srcdir}/source3/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+ cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=samba3 --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/source3/selftest/skip --testlist="${srcdir}/source3/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
cmd += ' | ${FORMAT_TEST_OUTPUT}'
else:
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
DD="$samba4bindir/cifsdd$EXEEXT"
SHARE=tmp
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
export WINBINDD_SOCKET_DIR=$PWD/st/dc/winbindd_socket
export SELFTEST_PREFIX=$PWD/st
export DOMAIN=SAMBADOMAIN
-export BUILDDIR=.
+export BINDIR=./bin
export DC_SERVER_IP=127.0.0.1
export SELFTEST_INTERFACES=127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8
export SOCKET_WRAPPER_DIR=$PWD/st/w
os.makedirs(env.SELFTEST_PREFIX, int('755', 8))
# We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
- cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=${srcdir} --exclude=${srcdir}/source4/selftest/skip --testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+ cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/source4/selftest/skip --testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
cmd += ' | ${FORMAT_TEST_OUTPUT}'
else:
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
gentest="$samba4bindir/gentest$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
locktest="$samba4bindir/locktest$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
masktest="$samba4bindir/masktest$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
return $status
}
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
nmblookup="$samba4bindir/nmblookup$EXEEXT"
testit "nmblookup -U \$SERVER_IP \$SERVER" $nmblookup $TORTURE_OPTIONS -U $SERVER_IP $SERVER
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT"
samba_tool="$samba4bindir/samba-tool$EXEEXT"
shift 7
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
smbclient="$samba4bindir/smbclient$EXEEXT"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT"
shift 5
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT"
samba_tool="$samba4bindir/samba-tool$EXEEXT"
shift 7
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
smbclient="$samba4bindir/smbclient$EXEEXT"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT"
. `dirname $0`/subunit.sh
-samba_tool="$BUILDDIR/bin/samba-tool"
-samba4bindir="$BUILDDIR/bin"
+samba_tool="$BINDIR/samba-tool"
+samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT"
CONFIG="--configfile=$PREFIX/dc/etc/smb.conf"
export KRB5CCNAME
echo "testp@ssw0Rd" >$PREFIX/tmppassfile
testit "kinit with passwd" $samba4kinit -e arcfour-hmac-md5 --password-file=$PREFIX/tmppassfile $TESTUSER@SAMBA.EXAMPLE.COM || failed=`expr $failed + 1`
-testit "ktpass" $samba4srcdir/scripting/bin/ktpass.sh --host LOCALDC --out $PREFIX/testuser.kt --princ $TESTUSER --pass "testp@ssw0Rd" --path-to-ldbsearch=$BUILDDIR/bin|| failed=`expr $failed + 1`
+testit "ktpass" $samba4srcdir/scripting/bin/ktpass.sh --host LOCALDC --out $PREFIX/testuser.kt --princ $TESTUSER --pass "testp@ssw0Rd" --path-to-ldbsearch=$BINDIR/bin|| failed=`expr $failed + 1`
rm -f $KRB5CCNAME
return $status
}
-export PATH="$BUILDDIR/bin:$PATH"
+export PATH="$BINDIR:$PATH"
ldbsearch="$VALGRIND ldbsearch$EXEEXT"
shift 6
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
smbclient="$samba4bindir/smbclient$EXEEXT"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT"
samba_tool="$samba4bindir/samba-tool$EXEEXT"
shift 7
failed=0
-samba4bindir="$BUILDDIR/bin"
+samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
smbclient="$samba4bindir/smbclient$EXEEXT"
samba4kinit="$samba4bindir/samba4kinit$EXEEXT"