mirror of
https://github.com/samba-team/samba.git
synced 2025-01-03 01:18:10 +03:00
Move selftest code to top-level.
This commit is contained in:
parent
cb16488cb1
commit
182a0e3490
@ -405,8 +405,8 @@ if (defined($ENV{RUN_FROM_BUILD_FARM}) and
|
|||||||
|
|
||||||
my $tls_enabled = not $opt_quick;
|
my $tls_enabled = not $opt_quick;
|
||||||
$ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
|
$ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
|
||||||
$ENV{LDB_MODULES_PATH} = "$old_pwd/bin/modules/ldb";
|
$ENV{LDB_MODULES_PATH} = "$old_pwd/source4/bin/modules/ldb";
|
||||||
$ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/bin/modules";
|
$ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/source4/bin/modules";
|
||||||
sub prefix_pathvar($$)
|
sub prefix_pathvar($$)
|
||||||
{
|
{
|
||||||
my ($name, $newpath) = @_;
|
my ($name, $newpath) = @_;
|
||||||
@ -416,10 +416,10 @@ sub prefix_pathvar($$)
|
|||||||
$ENV{$name} = $newpath;
|
$ENV{$name} = $newpath;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
prefix_pathvar("PKG_CONFIG_PATH", "$old_pwd/bin/pkgconfig");
|
prefix_pathvar("PKG_CONFIG_PATH", "$old_pwd/source4/bin/pkgconfig");
|
||||||
# Required for smbscript:
|
# Required for smbscript:
|
||||||
prefix_pathvar("PATH", "$old_pwd/bin");
|
prefix_pathvar("PATH", "$old_pwd/source4/bin");
|
||||||
prefix_pathvar("PYTHONPATH", "$old_pwd/bin/python");
|
prefix_pathvar("PYTHONPATH", "$old_pwd/source4/bin/python");
|
||||||
|
|
||||||
if ($opt_socket_wrapper_keep_pcap) {
|
if ($opt_socket_wrapper_keep_pcap) {
|
||||||
# Socket wrapper keep pcap implies socket wrapper pcap
|
# Socket wrapper keep pcap implies socket wrapper pcap
|
@ -283,8 +283,8 @@ data.mk: config.status $(MK_FILES)
|
|||||||
testcov-html::
|
testcov-html::
|
||||||
|
|
||||||
include $(pidldir)/config.mk
|
include $(pidldir)/config.mk
|
||||||
selftestdir := $(srcdir)/selftest
|
selftestdir := $(srcdir)/../selftest
|
||||||
include $(selftestdir)/config.mk
|
include $(srcdir)/selftest/config.mk
|
||||||
|
|
||||||
showflags::
|
showflags::
|
||||||
@echo ' pwd = '`/bin/pwd`
|
@echo ' pwd = '`/bin/pwd`
|
||||||
|
@ -2,12 +2,12 @@ TEST_FORMAT = plain
|
|||||||
|
|
||||||
SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
|
SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
|
||||||
--builddir=$(builddir) --srcdir=$(srcdir) \
|
--builddir=$(builddir) --srcdir=$(srcdir) \
|
||||||
--expected-failures=$(srcdir)/samba4-knownfail \
|
--expected-failures=$(srcdir)/selftest/knownfail \
|
||||||
--format=$(TEST_FORMAT) \
|
--format=$(TEST_FORMAT) \
|
||||||
--exclude=$(srcdir)/samba4-skip --testlist="./selftest/samba4_tests.sh|" \
|
--exclude=$(srcdir)/selftest/skip --testlist="./selftest/tests.sh|" \
|
||||||
$(TEST_OPTIONS)
|
$(TEST_OPTIONS)
|
||||||
|
|
||||||
SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/samba4-slow
|
SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow
|
||||||
SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick
|
SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick
|
||||||
|
|
||||||
slowtest:: everything
|
slowtest:: everything
|
||||||
|
@ -23,8 +23,6 @@ then
|
|||||||
PERL=perl
|
PERL=perl
|
||||||
fi
|
fi
|
||||||
|
|
||||||
incdir=`dirname $0`
|
|
||||||
|
|
||||||
plantest() {
|
plantest() {
|
||||||
name=$1
|
name=$1
|
||||||
env=$2
|
env=$2
|
||||||
@ -56,9 +54,9 @@ plansmbtorturetest() {
|
|||||||
plantest "$modname" "$env" $cmdline
|
plantest "$modname" "$env" $cmdline
|
||||||
}
|
}
|
||||||
|
|
||||||
$incdir/../bin/smbtorture -V
|
bin/smbtorture -V
|
||||||
|
|
||||||
samba4srcdir=$incdir/..
|
samba4srcdir=.
|
||||||
samba4bindir=$samba4srcdir/bin
|
samba4bindir=$samba4srcdir/bin
|
||||||
SCRIPTDIR=$samba4srcdir/../testprogs/ejs
|
SCRIPTDIR=$samba4srcdir/../testprogs/ejs
|
||||||
smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
|
smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
|
||||||
@ -267,7 +265,7 @@ fi
|
|||||||
# the API. These mainly test that the various command-line options of commands
|
# the API. These mainly test that the various command-line options of commands
|
||||||
# work correctly.
|
# work correctly.
|
||||||
|
|
||||||
bbdir=$incdir/../../testprogs/blackbox
|
bbdir=../testprogs/blackbox
|
||||||
|
|
||||||
plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh
|
plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh
|
||||||
plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
|
plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
|
Loading…
Reference in New Issue
Block a user