From: Jelmer Vernooij Date: Sat, 11 Oct 2008 01:12:21 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest X-Git-Tag: samba-4.0.0alpha6~769^2~14^2^2 X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=0fd0fc75c46b39a611c7f9a56081105714d73e36;hp=47f7ef8f39ba482a7d6578ab82c9e0670381c4f8 Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest Conflicts: selftest/selftest.pl --- diff --git a/source4/selftest/README b/selftest/README similarity index 100% rename from source4/selftest/README rename to selftest/README diff --git a/source4/selftest/SocketWrapper.pm b/selftest/SocketWrapper.pm similarity index 100% rename from source4/selftest/SocketWrapper.pm rename to selftest/SocketWrapper.pm diff --git a/source4/selftest/Subunit.pm b/selftest/Subunit.pm similarity index 100% rename from source4/selftest/Subunit.pm rename to selftest/Subunit.pm diff --git a/source4/selftest/TODO b/selftest/TODO similarity index 100% rename from source4/selftest/TODO rename to selftest/TODO diff --git a/source4/selftest/output/buildfarm.pm b/selftest/output/buildfarm.pm similarity index 100% rename from source4/selftest/output/buildfarm.pm rename to selftest/output/buildfarm.pm diff --git a/source4/selftest/output/html.pm b/selftest/output/html.pm similarity index 100% rename from source4/selftest/output/html.pm rename to selftest/output/html.pm diff --git a/source4/selftest/output/plain.pm b/selftest/output/plain.pm similarity index 100% rename from source4/selftest/output/plain.pm rename to selftest/output/plain.pm diff --git a/source4/selftest/output/testresults.css b/selftest/output/testresults.css similarity index 100% rename from source4/selftest/output/testresults.css rename to selftest/output/testresults.css diff --git a/source4/selftest/selftest.pl b/selftest/selftest.pl similarity index 98% rename from source4/selftest/selftest.pl rename to selftest/selftest.pl index 92aa67e8d3e..1477d10d469 100755 --- a/source4/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -405,8 +405,8 @@ if (defined($ENV{RUN_FROM_BUILD_FARM}) and my $tls_enabled = not $opt_quick; $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no"); -$ENV{LDB_MODULES_PATH} = "$old_pwd/bin/modules/ldb"; -$ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/bin/modules"; +$ENV{LDB_MODULES_PATH} = "$old_pwd/source4/bin/modules/ldb"; +$ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/source4/bin/modules"; sub prefix_pathvar($$) { my ($name, $newpath) = @_; @@ -416,8 +416,8 @@ sub prefix_pathvar($$) $ENV{$name} = $newpath; } } -prefix_pathvar("PKG_CONFIG_PATH", "$old_pwd/bin/pkgconfig"); -prefix_pathvar("PYTHONPATH", "$old_pwd/bin/python"); +prefix_pathvar("PKG_CONFIG_PATH", "$old_pwd/source4/bin/pkgconfig"); +prefix_pathvar("PYTHONPATH", "$old_pwd/source4/bin/python"); if ($opt_socket_wrapper_keep_pcap) { # Socket wrapper keep pcap implies socket wrapper pcap diff --git a/source4/selftest/target/Kvm.pm b/selftest/target/Kvm.pm similarity index 100% rename from source4/selftest/target/Kvm.pm rename to selftest/target/Kvm.pm diff --git a/source4/selftest/target/Samba3.pm b/selftest/target/Samba3.pm similarity index 100% rename from source4/selftest/target/Samba3.pm rename to selftest/target/Samba3.pm diff --git a/source4/selftest/target/Samba4.pm b/selftest/target/Samba4.pm similarity index 100% rename from source4/selftest/target/Samba4.pm rename to selftest/target/Samba4.pm diff --git a/source4/selftest/target/Windows.pm b/selftest/target/Windows.pm similarity index 100% rename from source4/selftest/target/Windows.pm rename to selftest/target/Windows.pm diff --git a/source4/selftest/test_samba4.pl b/selftest/test_samba4.pl similarity index 100% rename from source4/selftest/test_samba4.pl rename to selftest/test_samba4.pl diff --git a/source4/selftest/test_subunit.pl b/selftest/test_subunit.pl similarity index 100% rename from source4/selftest/test_subunit.pl rename to selftest/test_subunit.pl diff --git a/source4/Makefile b/source4/Makefile index cab82674d21..1b5df9fa951 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -301,8 +301,8 @@ data.mk: config.status $(MK_FILES) testcov-html:: include $(pidldir)/config.mk -selftestdir := $(srcdir)/selftest -include $(selftestdir)/config.mk +selftestdir := $(srcdir)/../selftest +include $(srcdir)/selftest/config.mk showflags:: @echo ' pwd = '`/bin/pwd` diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index e4bb2df0ad9..dd440edb533 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -2,12 +2,12 @@ TEST_FORMAT = plain SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \ --builddir=$(builddir) --srcdir=$(srcdir) \ - --expected-failures=$(srcdir)/samba4-knownfail \ + --expected-failures=$(srcdir)/selftest/knownfail \ --format=$(TEST_FORMAT) \ - --exclude=$(srcdir)/samba4-skip --testlist="./selftest/samba4_tests.sh|" \ + --exclude=$(srcdir)/selftest/skip --testlist="./selftest/tests.sh|" \ $(TEST_OPTIONS) -SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/samba4-slow +SELFTEST_NOSLOW_OPTS = --exclude=$(srcdir)/selftest/slow SELFTEST_QUICK_OPTS = $(SELFTEST_NOSLOW_OPTS) --quick slowtest:: everything diff --git a/source4/samba4-knownfail b/source4/selftest/knownfail similarity index 100% rename from source4/samba4-knownfail rename to source4/selftest/knownfail diff --git a/source4/samba4-quick b/source4/selftest/quick similarity index 100% rename from source4/samba4-quick rename to source4/selftest/quick diff --git a/source4/samba4-skip b/source4/selftest/skip similarity index 100% rename from source4/samba4-skip rename to source4/selftest/skip diff --git a/source4/samba4-slow b/source4/selftest/slow similarity index 100% rename from source4/samba4-slow rename to source4/selftest/slow diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/tests.sh similarity index 99% rename from source4/selftest/samba4_tests.sh rename to source4/selftest/tests.sh index 9fc71a104f4..fa799f51ffd 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/tests.sh @@ -23,8 +23,6 @@ then PERL=perl fi -incdir=`dirname $0` - plantest() { name=$1 env=$2 @@ -56,9 +54,9 @@ plansmbtorturetest() { plantest "$modname" "$env" $cmdline } -$incdir/../bin/smbtorture -V +bin/smbtorture -V -samba4srcdir=$incdir/.. +samba4srcdir=. samba4bindir=$samba4srcdir/bin smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS" @@ -263,7 +261,7 @@ fi # the API. These mainly test that the various command-line options of commands # work correctly. -bbdir=$incdir/../../testprogs/blackbox +bbdir=../testprogs/blackbox plantest "blackbox.ndrdump" none $samba4srcdir/librpc/tests/test_ndrdump.sh plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"