[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Feb 27 11:25:02 UTC 2019
The branch, master has been updated
via 4f307f2302b selftest: force running with TZ=UTC
via be6cf83c01d autobuild: try to distribute the tasks a bit more
via 253acdafd2b .gitlab-ci.yml: use .shared_template for samba
via e0bd12e0543 autobuild: spread ad-dc tests over 6 autobuild/ci separate tasks/jobs
via 54278049e20 autobuild: add samba-ad-member task
via 2d576c3afce autobuild: run ad_dc_backup tests in samba-ad-dc-backup
via 1bc2456b87c autobuild: move maptoguest and simpleserver to 'samba-fileserver'
via 3cf317c9b86 autobuild: move nt4_dc_schannel out of 'samba'
via cd42d70d491 s4:selftest: make use of ad_dc_backup
via 13fe139fb26 selftest:Samba4: add ad_dc_backup alias to ad_dc
via 780cceaed9a s4:selftest: make use of ad_dc_default
via c217a15a2c3 selftest:Samba4: add ad_dc_default alias to ad_dc_ntvfs
via 3385b33cec1 s4:selftest: make use of ad_dc_slowtests
via c82b60c8272 selftest:Samba4: add ad_dc_slowtests alias to ad_dc_ntvfs
via 07b662e287b s4:selftest: use the fl2008dc alias when looping over all functional levels
via 62eeab8f6cb selftest:Samba4: add fl2008dc as alias to ad_dc_ntvfs
via ec115b9012c s4:selftest: move very slow tests on ad_dc_ntvfs into one location in tests.py
from eb13f70e374 libcli:auth: Remove unused header file
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4f307f2302b0fe8fd0fc6379eb8e6491faf8520c
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Feb 27 08:22:09 2019 +0100
selftest: force running with TZ=UTC
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Wed Feb 27 11:24:59 UTC 2019 on sn-devel-144
commit be6cf83c01db24b341125d4938f79304f875411a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 22:55:05 2019 +0100
autobuild: try to distribute the tasks a bit more
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 253acdafd2bf655cb8115aaf1e3a3522e96dde1c
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 21 09:05:18 2019 +0100
.gitlab-ci.yml: use .shared_template for samba
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit e0bd12e0543c5a39bf1cf015659ed32c116ab8cb
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 15:04:14 2019 +0100
autobuild: spread ad-dc tests over 6 autobuild/ci separate tasks/jobs
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 54278049e203a489c69fde0795c4551bcd46365d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 14:59:00 2019 +0100
autobuild: add samba-ad-member task
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 2d576c3afce92021501da9e56ca5504d3fd00310
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 15:12:36 2019 +0100
autobuild: run ad_dc_backup tests in samba-ad-dc-backup
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 1bc2456b87c4ddc603170d30e25cd615349a48e3
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 21 08:42:50 2019 +0100
autobuild: move maptoguest and simpleserver to 'samba-fileserver'
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 3cf317c9b866dd9820039669769af26a1195db7a
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 21 08:37:53 2019 +0100
autobuild: move nt4_dc_schannel out of 'samba'
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit cd42d70d491586b83f97100c10e1039c542d3b29
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 14:04:42 2019 +0100
s4:selftest: make use of ad_dc_backup
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 13fe139fb2661abf36701e35f2aca3a9a5df17ef
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 14:03:29 2019 +0100
selftest:Samba4: add ad_dc_backup alias to ad_dc
This will allow us to run really most tests in an isolated
autobuild/ci task later.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 780cceaed9aa130ca9cba199a4b98fa1c8bbc77a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 14:04:42 2019 +0100
s4:selftest: make use of ad_dc_default
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit c217a15a2c3c6b6c171d28a57f9b0248dacaec53
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 14:03:29 2019 +0100
selftest:Samba4: add ad_dc_default alias to ad_dc_ntvfs
This will allow us to run really most tests in an isolated
autobuild/ci task later.
This will apply to tests, which may not rely on the ntvfs backend, so
the ad_dc_default alias can point to another environment in future.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 3385b33cec1595374b2866ba5553acc6ed144ff4
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 14:04:42 2019 +0100
s4:selftest: make use of ad_dc_slowtests
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit c82b60c82725ec3c915335886facbcf7e23f9b11
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 14:03:29 2019 +0100
selftest:Samba4: add ad_dc_slowtests alias to ad_dc_ntvfs
This will allow us to run really slow tests in an isolated
autobuild/ci task later.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 07b662e287b94f0eb91361c84df1856b473c6a5b
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 21 15:07:42 2019 +0100
s4:selftest: use the fl2008dc alias when looping over all functional levels
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 62eeab8f6cb6d9c85353738a2da073e0a16bd418
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 14:01:10 2019 +0100
selftest:Samba4: add fl2008dc as alias to ad_dc_ntvfs
Using aliases it will be possible to split the large amount
of tests which use ad_dc_ntvfs into multiple autobuild/ci
tasks/jobs later.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ec115b9012c388ec1f4e9d04b8a47be8dacf13cd
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 13:58:31 2019 +0100
s4:selftest: move very slow tests on ad_dc_ntvfs into one location in tests.py
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 26 ++++--
script/autobuild.py | 147 +++++++++++++++++++++++++--------
selftest/knownfail | 10 +--
selftest/knownfail.d/password_settings | 7 +-
selftest/selftest.pl | 3 +
selftest/skip | 3 +-
selftest/target/Samba4.pm | 38 +++++++++
source4/selftest/tests.py | 135 +++++++++++++++---------------
8 files changed, 252 insertions(+), 117 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32a10181bfa..702f43760f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,9 @@ others:
- script/autobuild.py tdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- script/autobuild.py tevent --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+samba:
+ extends: .shared_template
+
samba-none-env:
extends: .shared_template
# this one takes about 1 hours to finish
@@ -76,9 +79,23 @@ samba-xc:
samba-o3:
extends: .shared_template
+samba-ad-member:
+ extends: .shared_template
+
samba-ad-dc-2:
extends: .shared_template
- # this one takes about 1 hours to finish
+
+samba-ad-dc-3:
+ extends: .shared_template
+
+samba-ad-dc-4:
+ extends: .shared_template
+
+samba-ad-dc-5:
+ extends: .shared_template
+
+samba-ad-dc-6:
+ extends: .shared_template
samba-ad-dc-backup:
extends: .shared_template
@@ -119,17 +136,12 @@ samba-ad-dc-ntvfs:
# settings -> CI/CD -> Environment variables
- $SUPPORT_PRIVATE_TEST == "yes"
-samba:
- extends: .private_template
- # this one takes about 4 hours to finish
-
samba-fileserver:
extends: .private_template
# this one takes about 1 hours to finish
-samba-ad-dc:
+samba-ad-dc-1:
extends: .private_template
- # this one takes about 1 hours to finish
samba-nt4:
extends: .private_template
diff --git a/script/autobuild.py b/script/autobuild.py
index 729f118019c..d62e721a3cd 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -38,15 +38,20 @@ builddirs = {
"samba": ".",
"samba-nt4": ".",
"samba-fileserver": ".",
+ "samba-ad-member": ".",
"samba-xc": ".",
"samba-o3": ".",
"samba-ctdb": ".",
"samba-libs": ".",
"samba-static": ".",
"samba-none-env": ".",
- "samba-ad-dc": ".",
- "samba-ad-dc-ntvfs": ".",
+ "samba-ad-dc-1": ".",
"samba-ad-dc-2": ".",
+ "samba-ad-dc-3": ".",
+ "samba-ad-dc-4": ".",
+ "samba-ad-dc-5": ".",
+ "samba-ad-dc-6": ".",
+ "samba-ad-dc-ntvfs": ".",
"samba-ad-dc-backup": ".",
"samba-systemkrb5": ".",
"samba-nopython": ".",
@@ -76,7 +81,7 @@ samba_libs_configure_bundled_libs = " --bundled-libraries=!talloc,!pytalloc-util
samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bundled_libs
tasks = {
- "ctdb": [("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
+ "ctdb": [("random-sleep", "../script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure " + ctdb_configure_params, "text/plain"),
("make", "make all", "text/plain"),
("install", "make install", "text/plain"),
@@ -86,74 +91,149 @@ tasks = {
# We have 'test' before 'install' because, 'test' should work without 'install (runs all the other envs)'
"samba": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
"TESTS='--exclude-env=none "
"--exclude-env=nt4_dc "
+ "--exclude-env=nt4_dc_schannel "
"--exclude-env=nt4_member "
"--exclude-env=ad_dc "
+ "--exclude-env=ad_dc_backup "
"--exclude-env=ad_dc_ntvfs "
+ "--exclude-env=ad_dc_default "
+ "--exclude-env=ad_dc_slowtests "
"--exclude-env=ad_dc_no_nss "
+ "--exclude-env=ad_dc_no_ntlm "
"--exclude-env=fl2003dc "
+ "--exclude-env=fl2008dc "
"--exclude-env=fl2008r2dc "
"--exclude-env=ad_member "
"--exclude-env=ad_member_idmap_rid "
"--exclude-env=ad_member_idmap_ad "
+ "--exclude-env=ad_member_rfc2307 "
"--exclude-env=chgdcpass "
"--exclude-env=vampire_2000_dc "
"--exclude-env=fl2000dc "
"--exclude-env=fileserver "
+ "--exclude-env=maptoguest "
+ "--exclude-env=simpleserver "
"--exclude-env=backupfromdc "
"--exclude-env=restoredc "
"--exclude-env=renamedc "
"--exclude-env=offlinebackupdc "
"--exclude-env=labdc "
+ "--exclude-env=preforkrestartdc "
+ "--exclude-env=proclimitdc "
+ "--exclude-env=promoted_dc "
+ "--exclude-env=vampire_dc "
+ "--exclude-env=rodc "
+ "--exclude-env=ad_dc_default "
+ "--exclude-env=ad_dc_slowtests "
"'",
"text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
- "samba-nt4": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-nt4": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --without-ads --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
- "TESTS='--include-env=nt4_dc --include-env=nt4_member'", "text/plain"),
+ "TESTS='"
+ "--include-env=nt4_dc "
+ "--include-env=nt4_dc_schannel "
+ "--include-env=nt4_member "
+ "'", "text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
- "samba-fileserver": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-fileserver": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
- "TESTS='--include-env=fileserver'", "text/plain"),
+ "TESTS='"
+ "--include-env=fileserver "
+ "--include-env=maptoguest "
+ "--include-env=simpleserver "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
- "samba-ad-dc": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-ad-member": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=ad_member "
+ "--include-env=ad_member_idmap_rid "
+ "--include-env=ad_member_idmap_ad "
+ "--include-env=ad_member_rfc2307 "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-1": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
"TESTS='--include-env=ad_dc "
- "--include-env=fl2003dc "
- "--include-env=fl2008r2dc "
- "--include-env=ad_member "
- "--include-env=ad_member_idmap_rid "
- "--include-env=ad_member_idmap_ad'", "text/plain"),
+ "--include-env=ad_dc_no_nss "
+ "--include-env=ad_dc_no_ntlm "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
- "samba-ad-dc-2": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-ad-dc-2": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
- "TESTS='--include-env=chgdcpass "
+ "TESTS='"
+ "--include-env=vampire_dc "
"--include-env=vampire_2000_dc "
+ "--include-env=rodc "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-3": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=promoted_dc "
+ "--include-env=chgdcpass "
+ "--include-env=preforkrestartdc "
+ "--include-env=proclimitdc "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-4": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
"--include-env=fl2000dc "
- "--include-env=ad_dc_no_nss "
- "'",
- "text/plain"),
+ "--include-env=fl2003dc "
+ "--include-env=fl2008dc "
+ "--include-env=fl2008r2dc "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-5": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=ad_dc_default "
+ "'", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+
+ "samba-ad-dc-6": [("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "make -j", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='"
+ "--include-env=ad_dc_slowtests "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
# We split out the ad_dc_ntvfs tests (which are long) so other test do not wait
@@ -163,13 +243,14 @@ tasks = {
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
- "TESTS='--include-env=ad_dc_ntvfs'",
- "text/plain"),
+ "TESTS='"
+ "--include-env=ad_dc_ntvfs "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
# run the backup/restore testenvs separately as they're fairly standalone
# (and CI seems to max out at ~8 different DCs running at once)
- "samba-ad-dc-backup": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-ad-dc-backup": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 "
@@ -178,8 +259,8 @@ tasks = {
"--include-env=renamedc "
"--include-env=offlinebackupdc "
"--include-env=labdc "
- "'",
- "text/plain"),
+ "--include-env=ad_dc_backup "
+ "'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
"samba-test-only": [("configure", "./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"),
@@ -187,7 +268,7 @@ tasks = {
("test", 'make test FAIL_IMMEDIATELY=1 TESTS="${TESTS}"', "text/plain")],
# Test cross-compile infrastructure
- "samba-xc": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-xc": [("random-sleep", "script/random-sleep.sh 900 1500", "text/plain"),
("configure-native", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("configure-cross-execute", "./configure.developer --out ./bin-xe --cross-compile --cross-execute=script/identity_cc.sh" \
" --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xe/ab" + samba_configure_params, "text/plain"),
@@ -199,7 +280,7 @@ tasks = {
"./bin-xa/c4che/default{}".format(*([CACHE_SUFFIX]*3)), "text/plain")],
# test build with -O3 -- catches extra warnings and bugs, tests the ad_dc environments
- "samba-o3": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-o3": [("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "ADDITIONAL_CFLAGS='-O3 -Wp,-D_FORTIFY_SOURCE=2' ./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make quicktest FAIL_IMMEDIATELY=1 "
@@ -208,7 +289,7 @@ tasks = {
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
- "samba-ctdb": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ "samba-ctdb": [("random-sleep", "script/random-sleep.sh 900 1500", "text/plain"),
# make sure we have tdb around:
("tdb-configure", "cd lib/tdb && PYTHONPATH=${PYTHON_PREFIX}:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
@@ -229,7 +310,7 @@ tasks = {
("ctdb-clean", "cd ./ctdb && make clean", "text/plain")],
"samba-libs": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("talloc-configure", "cd lib/talloc && " + samba_libs_configure_libs, "text/plain"),
("talloc-make", "cd lib/talloc && make", "text/plain"),
("talloc-install", "cd lib/talloc && make install", "text/plain"),
@@ -258,7 +339,7 @@ tasks = {
("allshared-make", "make -j", "text/plain")],
"samba-none-env": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test "
@@ -267,7 +348,7 @@ tasks = {
"text/plain")],
"samba-static": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 1 1", "text/plain"),
# build with all modules static
("allstatic-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=ALL", "text/plain"),
("allstatic-make", "make -j", "text/plain"),
@@ -287,7 +368,7 @@ tasks = {
("nonshared-make", "make -j", "text/plain")],
"samba-systemkrb5": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 900 1500", "text/plain"),
("configure", "./configure.developer " + samba_configure_params + " --with-system-mitkrb5 --without-ad-dc", "text/plain"),
("make", "make -j", "text/plain"),
# we currently cannot run a full make test, a limited list of tests could be run
@@ -306,7 +387,7 @@ tasks = {
# support this environment). The target here is for vendors
# shipping a minimal smbd.
"samba-nopython": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc", "text/plain"),
("make", "make -j", "text/plain"),
("install", "make install", "text/plain"),
@@ -340,7 +421,7 @@ tasks = {
# check we can do the same thing using python2
"samba-nopython-py2": [
- ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("random-sleep", "script/random-sleep.sh 300 900", "text/plain"),
("configure", "PYTHON=python2 ./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc", "text/plain"),
("make", "PYTHON=python2 make -j", "text/plain"),
("install", "PYTHON=python2 make install", "text/plain"),
diff --git a/selftest/knownfail b/selftest/knownfail
index abbbd889c71..dc78838f9c1 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -86,8 +86,8 @@
^samba4.rpc.netlogon.*.GetPassword
^samba4.rpc.netlogon.*.DatabaseRedo
^samba4.rpc.netlogon.*.netlogon.lsa_over_netlogon\(ad_dc\) #Broken by split of \\pipe\lsass from \\pipe\netlogon in the IDL
-^samba4.rpc.netlogon.*.netlogon.SetupCredentialsDowngrade\(ad_dc_ntvfs\) # Broken by allowing NT4 crypto on this environment
-^samba4.rpc.netlogon.*.netlogon.SetupCredentialsDowngrade\(ad_dc_ntvfs:local\) # Broken by allowing NT4 crypto on this environment
+^samba4.rpc.netlogon.*.netlogon.SetupCredentialsDowngrade\(ad_dc_default\) # Broken by allowing NT4 crypto on this environment
+^samba4.rpc.netlogon.*.netlogon.SetupCredentialsDowngrade\(ad_dc_default:local\) # Broken by allowing NT4 crypto on this environment
^samba4.rpc.drsuapi.*ncacn_ip_tcp.*validate # should only work with seal
^samba4.rpc.drsuapi.*ncacn_ip_tcp.*bigendian # should only work with seal
^samba4.rpc.samr.passwords.validate.*ncacn_ip_tcp.*with.validate # should only work with seal
@@ -97,7 +97,7 @@
.*net.api.delshare.* # DelShare isn't implemented yet
^samba4.smb2.oplock.doc
^samba4.smb2.lock.valid-request
-^samba4.ldap.python \(ad_dc_ntvfs\).Test add_ldif\(\) with BASE64 security descriptor input using WRONG domain SID\(.*\)$
+^samba4.ldap.python \(ad_dc_default\).Test add_ldif\(\) with BASE64 security descriptor input using WRONG domain SID\(.*\)$
^samba4.raw.lock.*.async # bug 6960
^samba4.raw.open.ntcreatex_supersede
^samba4.smb2.lock.*.multiple-unlock # bug 6959
@@ -123,8 +123,8 @@
^samba4.smb2.acls.*.inheritflags
^samba4.smb2.acls.*.owner
^samba4.smb2.acls.*.ACCESSBASED
-^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
-#^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.*
+^samba4.ldap.dirsync.python.ad_dc_default..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
+#^samba4.ldap.dirsync.python.ad_dc_default..__main__.ExtendedDirsyncTests.*
^samba4.libsmbclient.opendir.(NT1|SMB3).opendir # This requires netbios browsing
^samba4.rpc.drsuapi.*.drsuapi.DsGetDomainControllerInfo\(.*\)$
^samba4.smb2.oplock.exclusive2\(.*\)$ # samba 4 oplocks are a mess
diff --git a/selftest/knownfail.d/password_settings b/selftest/knownfail.d/password_settings
index 9f586c90ead..91093fe644d 100644
--- a/selftest/knownfail.d/password_settings
+++ b/selftest/knownfail.d/password_settings
@@ -1,5 +1,4 @@
# highlights a minor corner-case discrepancy between Windows and Samba
-samba4.ldap.passwordsettings.python.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\)
-samba4.ldap.passwordsettings.python.python3.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\)
-samba4.ldap.passwordsettings.python.python2.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_ntvfs\)
-
+samba4.ldap.passwordsettings.python.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default\)
+samba4.ldap.passwordsettings.python.python3.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default\)
+samba4.ldap.passwordsettings.python.python2.password_settings.PasswordSettingsTestCase.test_domain_pwd_history_zero\(ad_dc_default\)
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index ec44b89dac7..f04e2b2ce2d 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -301,6 +301,9 @@ unless (defined($ENV{VALGRIND})) {
# make all our python scripts unbuffered
$ENV{PYTHONUNBUFFERED} = 1;
+# do not depend on the users setup
+$ENV{TZ} = "UTC";
+
my $bindir_abs = abs_path($bindir);
# Backwards compatibility:
diff --git a/selftest/skip b/selftest/skip
index b88412c082d..3e9a25fc0a3 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -83,6 +83,7 @@
^samba4.raw.ping.pong # Needs second server to test
^samba4.rpc.samr.accessmask
^samba4.rpc.samr.passwords.*ncacn_np\(ad_dc_ntvfs\) # currently fails, possibly config issue
+^samba4.rpc.samr.passwords.*ncacn_np\(ad_dc_slowtests\) # currently fails, possibly config issue
^samba4.rpc.samr.passwords.*s4member # currently fails, possibly config issue
^samba4.raw.scan.eamax
^samba4.smb2.notify
@@ -119,7 +120,7 @@
^samba4.rpc.dfs # Not provided by Samba 4
^samba4.rpc.witness # Not provided by Samba 4
^samba4.rpc.clusapi # clusapi server support not yet provided
-^samba4.rpc.iremotewinspool.*\(ad_dc_ntvfs\)$ # Not provided by Samba 4
+^samba4.rpc.iremotewinspool.*\(ad_dc_default\)$ # Not provided by Samba 4
^samba4.*.base.samba3.* # Samba3-specific test
^samba4.*.raw.samba3.* # Samba3-specific test
^samba4.rpc..*samba3.* # Samba3-specific test
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index e4b05997a0c..8b62c5e9c11 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2261,9 +2261,47 @@ sub check_env($$)
offlinebackupdc => ["backupfromdc"],
labdc => ["backupfromdc"],
+ # aliases in order to split autbuild tasks
+ fl2008dc => ["ad_dc_ntvfs"],
+ ad_dc_default => ["ad_dc_ntvfs"],
+ ad_dc_slowtests => ["ad_dc_ntvfs"],
+ ad_dc_backup => ["ad_dc"],
+
none => [],
);
+sub return_alias_env
+{
+ my ($self, $path, $env) = @_;
+
+ # just an alias
+ return $env;
+}
+
+sub setup_fl2008dc
+{
+ my ($self, $path, $dep_env) = @_;
+ return $self->return_alias_env($path, $dep_env)
+}
+
+sub setup_ad_dc_default
+{
+ my ($self, $path, $dep_env) = @_;
+ return $self->return_alias_env($path, $dep_env)
+}
+
+sub setup_ad_dc_slowtests
+{
+ my ($self, $path, $dep_env) = @_;
+ return $self->return_alias_env($path, $dep_env)
+}
+
+sub setup_ad_dc_backup
+{
+ my ($self, $path, $dep_env) = @_;
+ return $self->return_alias_env($path, $dep_env)
--
Samba Shared Repository
More information about the samba-cvs
mailing list