summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--selftest/README (renamed from source4/selftest/README)0
-rw-r--r--selftest/SocketWrapper.pm (renamed from source4/selftest/SocketWrapper.pm)0
-rw-r--r--selftest/Subunit.pm (renamed from source4/selftest/Subunit.pm)0
-rw-r--r--selftest/TODO (renamed from source4/selftest/TODO)0
-rw-r--r--selftest/output/buildfarm.pm (renamed from source4/selftest/output/buildfarm.pm)0
-rw-r--r--selftest/output/html.pm (renamed from source4/selftest/output/html.pm)0
-rw-r--r--selftest/output/plain.pm (renamed from source4/selftest/output/plain.pm)0
-rw-r--r--selftest/output/testresults.css (renamed from source4/selftest/output/testresults.css)0
-rwxr-xr-xselftest/selftest.pl (renamed from source4/selftest/selftest.pl)8
-rw-r--r--selftest/target/Kvm.pm (renamed from source4/selftest/target/Kvm.pm)0
-rw-r--r--selftest/target/Samba3.pm (renamed from source4/selftest/target/Samba3.pm)0
-rw-r--r--selftest/target/Samba4.pm (renamed from source4/selftest/target/Samba4.pm)0
-rw-r--r--selftest/target/Windows.pm (renamed from source4/selftest/target/Windows.pm)0
-rwxr-xr-xselftest/test_samba4.pl (renamed from source4/selftest/test_samba4.pl)0
-rwxr-xr-xselftest/test_subunit.pl (renamed from source4/selftest/test_subunit.pl)0
-rw-r--r--source4/Makefile4
-rw-r--r--source4/selftest/config.mk6
-rw-r--r--source4/selftest/knownfail (renamed from source4/samba4-knownfail)0
-rw-r--r--source4/selftest/quick (renamed from source4/samba4-quick)0
-rw-r--r--source4/selftest/skip (renamed from source4/samba4-skip)0
-rw-r--r--source4/selftest/slow (renamed from source4/samba4-slow)0
-rwxr-xr-xsource4/selftest/tests.sh (renamed from source4/selftest/samba4_tests.sh)8
22 files changed, 12 insertions, 14 deletions
diff --git a/source4/selftest/README b/selftest/README
index f8be20a569..f8be20a569 100644
--- a/source4/selftest/README
+++ b/selftest/README
diff --git a/source4/selftest/SocketWrapper.pm b/selftest/SocketWrapper.pm
index e63605b8df..e63605b8df 100644
--- a/source4/selftest/SocketWrapper.pm
+++ b/selftest/SocketWrapper.pm
diff --git a/source4/selftest/Subunit.pm b/selftest/Subunit.pm
index 05e51da541..05e51da541 100644
--- a/source4/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
diff --git a/source4/selftest/TODO b/selftest/TODO
index 67776ffc76..67776ffc76 100644
--- a/source4/selftest/TODO
+++ b/selftest/TODO
diff --git a/source4/selftest/output/buildfarm.pm b/selftest/output/buildfarm.pm
index cee6c1e63a..cee6c1e63a 100644
--- a/source4/selftest/output/buildfarm.pm
+++ b/selftest/output/buildfarm.pm
diff --git a/source4/selftest/output/html.pm b/selftest/output/html.pm
index 1049527129..1049527129 100644
--- a/source4/selftest/output/html.pm
+++ b/selftest/output/html.pm
diff --git a/source4/selftest/output/plain.pm b/selftest/output/plain.pm
index 4e1e290534..4e1e290534 100644
--- a/source4/selftest/output/plain.pm
+++ b/selftest/output/plain.pm
diff --git a/source4/selftest/output/testresults.css b/selftest/output/testresults.css
index 66d1d6b2ad..66d1d6b2ad 100644
--- a/source4/selftest/output/testresults.css
+++ b/selftest/output/testresults.css
diff --git a/source4/selftest/selftest.pl b/selftest/selftest.pl
index 92aa67e8d3..1477d10d46 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
index 3b17a2909c..3b17a2909c 100644
--- a/source4/selftest/target/Kvm.pm
+++ b/selftest/target/Kvm.pm
diff --git a/source4/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index b0c4eb22bd..b0c4eb22bd 100644
--- a/source4/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
diff --git a/source4/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 9364008ee2..9364008ee2 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
diff --git a/source4/selftest/target/Windows.pm b/selftest/target/Windows.pm
index d0c90d7f7b..d0c90d7f7b 100644
--- a/source4/selftest/target/Windows.pm
+++ b/selftest/target/Windows.pm
diff --git a/source4/selftest/test_samba4.pl b/selftest/test_samba4.pl
index f2935be66b..f2935be66b 100755
--- a/source4/selftest/test_samba4.pl
+++ b/selftest/test_samba4.pl
diff --git a/source4/selftest/test_subunit.pl b/selftest/test_subunit.pl
index 28522ed49f..28522ed49f 100755
--- a/source4/selftest/test_subunit.pl
+++ b/selftest/test_subunit.pl
diff --git a/source4/Makefile b/source4/Makefile
index 7dae4729b7..26cab668c8 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 58db087105..74c177d8e8 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
index f99db4fb1b..f99db4fb1b 100644
--- a/source4/samba4-knownfail
+++ b/source4/selftest/knownfail
diff --git a/source4/samba4-quick b/source4/selftest/quick
index 7bea619f18..7bea619f18 100644
--- a/source4/samba4-quick
+++ b/source4/selftest/quick
diff --git a/source4/samba4-skip b/source4/selftest/skip
index e3e2d2d525..e3e2d2d525 100644
--- a/source4/samba4-skip
+++ b/source4/selftest/skip
diff --git a/source4/samba4-slow b/source4/selftest/slow
index d414368de8..d414368de8 100644
--- a/source4/samba4-slow
+++ b/source4/selftest/slow
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/tests.sh
index 9fc71a104f..fa799f51ff 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"
generated by cgit (git 2.34.1) at 2024-11-23 22:39:25 +0000