[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Jun 21 00:53:02 UTC 2019
The branch, master has been updated
via e121c14405f provision: Suggest "minimal-responses yes;" by default
via 7ee655970d3 README: fix samba mailman list address
via 8de56ddc92e script/autobuild.py: make code more pythonic
via fb12a252613 script/autobuild.py: avoid nested try except block
via ae90e5263bd script/autobuild.py: rm redundant empty str in options
via 04a6967bc39 script/autobuild.py: define cwd for builder and avoid chdir
via 6fc3eb8926a script/autobuild.py: improve run_cmd with check_output
via 0daeb6046bd script/autobuild.py: add helper functions to simplify make test cmd
via 0383747dcc5 script/autobuild.py: replace random-sleep.sh with python function
via 1b70d43ed1f script/autobuild.py: rm unused mime type text/plain in tasks
via 41d93a6da5b script/autobuild.py: fix tasks indent
via 33cc2692510 gitlab-ci: Add Fedora 30
via b201dd33e04 regfio: Return instead of assert for short blocks
from d4ace83baaa smbd: Remove struct blocking_lock_record
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e121c14405f9257ef640d2651326f082707cb66f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Jun 20 05:11:41 2019 +1200
provision: Suggest "minimal-responses yes;" by default
This improves Samba AD DC performance as a DNS server dramatically, because NS records do not
need to be looked up and there is less risk the response will have to fall back
to TCP, doubling the cost again.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Jun 21 00:52:19 UTC 2019 on sn-devel-184
commit 7ee655970d3d0d2af5e5b4468ea841349a492892
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jun 20 12:27:46 2019 +0200
README: fix samba mailman list address
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 8de56ddc92ecb3d7607dc7d61dc9e2a623a5e606
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Tue May 21 13:56:12 2019 +1200
script/autobuild.py: make code more pythonic
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit fb12a252613205dd0ebcfc8716847aed510e07cb
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu May 23 14:07:49 2019 +1200
script/autobuild.py: avoid nested try except block
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ae90e5263bd65042b067ab900c83bf310f977dbd
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Thu May 23 14:04:18 2019 +1200
script/autobuild.py: rm redundant empty str in options
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 04a6967bc393e0305bac9f33a42cceb4eb88f20b
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed May 22 23:50:01 2019 +1200
script/autobuild.py: define cwd for builder and avoid chdir
We can pass cwd in Popen, no need to chdir for each cmd.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 6fc3eb8926a1618c2acdf80f9b8d5cc213a90e4d
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed May 22 12:15:40 2019 +1200
script/autobuild.py: improve run_cmd with check_output
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0daeb6046bd9170adac797a7d7227c69aa5e307a
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed May 22 23:29:56 2019 +1200
script/autobuild.py: add helper functions to simplify make test cmd
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0383747dcc5af4a3832aa938e99df81ae6357c21
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed May 22 22:34:57 2019 +1200
script/autobuild.py: replace random-sleep.sh with python function
The random-sleep.sh script is tricky, and there is no need to rely on another
script just for random sleep.
Using the python function, the random number generation will happen when
load autobuild.py other than execute cmd, but shouldn't affect the
result.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1b70d43ed1fde70179d7cdb4426bacd1a2ddfc33
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed May 22 22:17:28 2019 +1200
script/autobuild.py: rm unused mime type text/plain in tasks
The mime type `text/plain` is repeated everywhere but not used any more.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 41d93a6da5b99b72fabe872d124171f6ae5c897f
Author: Joe Guo <joeg at catalyst.net.nz>
Date: Wed May 22 22:11:28 2019 +1200
script/autobuild.py: fix tasks indent
Indent tasks at same level, make it easier to copy/move lines arround.
Signed-off-by: Joe Guo <joeg at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 33cc2692510d6963ffb33d5cbb4233e1111f8928
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jun 17 13:18:36 2019 +0200
gitlab-ci: Add Fedora 30
Fedora 30 ships with gcc9.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit b201dd33e0403d7259b91d4fcd4df2445703a34c
Author: Michael Hanselmann <public at hansmi.ch>
Date: Thu Apr 4 02:26:13 2019 +0200
regfio: Return instead of assert for short blocks
Assertions should only be used when there's absolutely no recovery or to
verify data structure invariants. In this case the supplied registry
hive file may have a malformed block with a size of zero. Such a block
should not terminate the whole program.
Signed-off-by: Michael Hanselmann <public at hansmi.ch>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 7 +-
README.md | 2 +-
bootstrap/.gitlab-ci.yml | 3 +
bootstrap/READMD.md | 2 +-
bootstrap/config.py | 8 +
bootstrap/generated-dists/Vagrantfile | 7 +
.../{debian7 => fedora30}/Dockerfile | 2 +-
.../{fedora28 => fedora30}/bootstrap.sh | 0
.../{centos6 => fedora30}/locale.sh | 0
.../{fedora28 => fedora30}/packages.yml | 0
bootstrap/sha1sum.txt | 2 +-
script/autobuild.py | 1097 ++++++++++----------
script/random-sleep.sh | 25 -
source3/registry/regfio.c | 3 +-
source4/setup/named.txt | 6 +-
15 files changed, 599 insertions(+), 565 deletions(-)
copy bootstrap/generated-dists/{debian7 => fedora30}/Dockerfile (92%)
copy bootstrap/generated-dists/{fedora28 => fedora30}/bootstrap.sh (100%)
copy bootstrap/generated-dists/{centos6 => fedora30}/locale.sh (100%)
copy bootstrap/generated-dists/{fedora28 => fedora30}/packages.yml (100%)
delete mode 100755 script/random-sleep.sh
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65d7ad659b9..7ac73546989 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: a50a08a6ecfbe1113f3892c0cb3e2646d58a1521
+ SAMBA_CI_CONTAINER_TAG: 563ddb220bfed37501be93b0b3204bb1ceb61b94
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -38,6 +38,7 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
+ SAMBA_CI_CONTAINER_IMAGE_fedora30: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora30:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG}
include:
@@ -267,6 +268,10 @@ fedora29-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_fedora29
+fedora30-samba-o3:
+ extends: .samba-o3-template
+ image: $SAMBA_CI_CONTAINER_IMAGE_fedora30
+
#
# Keep the samba-o3 sections at the end ...
#
diff --git a/README.md b/README.md
index 25a41c13624..15b0b46f8b0 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ A list of Samba documentation in languages other than English is
available on the webpage.
If you would like to help with the documentation, please coordinate
-on the samba at samba.org mailing list. See the next section for details
+on the samba at lists.samba.org mailing list. See the next section for details
on subscribing to samba mailing lists.
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 1b07c54afd2..abd87eada5b 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -100,6 +100,9 @@ debian8:
debian7:
extends: .build_image_template_force_broken
+fedora30:
+ extends: .build_image_template
+
fedora29:
extends: .build_image_template
diff --git a/bootstrap/READMD.md b/bootstrap/READMD.md
index 672c0522c77..3d22ab136a0 100644
--- a/bootstrap/READMD.md
+++ b/bootstrap/READMD.md
@@ -94,7 +94,7 @@ With Vagrant:
Or a remote/cloud machine:
- scp bootstrap/generated-dists/fedora29/bootstrap.sh USER at IP:
+ scp bootstrap/generated-dists/fedora30/bootstrap.sh USER at IP:
ssh USER at IP
sudo bash ./bootstrap.sh
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 279d1f0a046..1ee53ef27d4 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -496,6 +496,14 @@ RPM_DISTS = {
'lsb-release': 'redhat-lsb',
}
},
+ 'fedora30': {
+ 'docker_image': 'fedora:30',
+ 'vagrant_box': 'fedora/30-cloud-base',
+ 'bootstrap': DNF_BOOTSTRAP,
+ 'replace': {
+ 'lsb-release': 'redhat-lsb',
+ }
+ },
'opensuse150': {
'docker_image': 'opensuse/leap:15.0',
'vagrant_box': 'opensuse/openSUSE-15.0-x86_64',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 8dbac2c73c1..9754bd4115f 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -59,6 +59,13 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "fedora29/locale.sh"
end
+ config.vm.define "fedora30" do |v|
+ v.vm.box = "fedora/30-cloud-base"
+ v.vm.hostname = "fedora30"
+ v.vm.provision :shell, path: "fedora30/bootstrap.sh"
+ v.vm.provision :shell, path: "fedora30/locale.sh"
+ end
+
config.vm.define "opensuse150" do |v|
v.vm.box = "opensuse/openSUSE-15.0-x86_64"
v.vm.hostname = "opensuse150"
diff --git a/bootstrap/generated-dists/debian7/Dockerfile b/bootstrap/generated-dists/fedora30/Dockerfile
similarity index 92%
copy from bootstrap/generated-dists/debian7/Dockerfile
copy to bootstrap/generated-dists/fedora30/Dockerfile
index dfe0e389653..f2a2c3546f0 100644
--- a/bootstrap/generated-dists/debian7/Dockerfile
+++ b/bootstrap/generated-dists/fedora30/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM debian:7
+FROM fedora:30
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh
similarity index 100%
copy from bootstrap/generated-dists/fedora28/bootstrap.sh
copy to bootstrap/generated-dists/fedora30/bootstrap.sh
diff --git a/bootstrap/generated-dists/centos6/locale.sh b/bootstrap/generated-dists/fedora30/locale.sh
similarity index 100%
copy from bootstrap/generated-dists/centos6/locale.sh
copy to bootstrap/generated-dists/fedora30/locale.sh
diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora30/packages.yml
similarity index 100%
copy from bootstrap/generated-dists/fedora28/packages.yml
copy to bootstrap/generated-dists/fedora30/packages.yml
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 7aa5a4a6aea..27772a959be 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-a50a08a6ecfbe1113f3892c0cb3e2646d58a1521
+563ddb220bfed37501be93b0b3204bb1ceb61b94
diff --git a/script/autobuild.py b/script/autobuild.py
index b62bea25d4d..ef75f507add 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -4,11 +4,12 @@
# released under GNU GPL v3 or later
from __future__ import print_function
-from subprocess import call, check_call, Popen, PIPE
+from subprocess import call, check_call, check_output, Popen, PIPE
import os
import tarfile
import sys
import time
+import random
from optparse import OptionParser
import smtplib
import email
@@ -50,41 +51,41 @@ if gitroot is None:
def_testbase = os.getenv("AUTOBUILD_TESTBASE", "/memdisk/%s" % os.getenv('USER'))
parser = OptionParser()
-parser.add_option("", "--tail", help="show output while running", default=False, action="store_true")
-parser.add_option("", "--keeplogs", help="keep logs", default=False, action="store_true")
-parser.add_option("", "--nocleanup", help="don't remove test tree", default=False, action="store_true")
-parser.add_option("", "--testbase", help="base directory to run tests in (default %s)" % def_testbase,
+parser.add_option("--tail", help="show output while running", default=False, action="store_true")
+parser.add_option("--keeplogs", help="keep logs", default=False, action="store_true")
+parser.add_option("--nocleanup", help="don't remove test tree", default=False, action="store_true")
+parser.add_option("--testbase", help="base directory to run tests in (default %s)" % def_testbase,
default=def_testbase)
-parser.add_option("", "--passcmd", help="command to run on success", default=None)
-parser.add_option("", "--verbose", help="show all commands as they are run",
+parser.add_option("--passcmd", help="command to run on success", default=None)
+parser.add_option("--verbose", help="show all commands as they are run",
default=False, action="store_true")
-parser.add_option("", "--rebase", help="rebase on the given tree before testing",
+parser.add_option("--rebase", help="rebase on the given tree before testing",
default=None, type='str')
-parser.add_option("", "--pushto", help="push to a git url on success",
+parser.add_option("--pushto", help="push to a git url on success",
default=None, type='str')
-parser.add_option("", "--mark", help="add a Tested-By signoff before pushing",
+parser.add_option("--mark", help="add a Tested-By signoff before pushing",
default=False, action="store_true")
-parser.add_option("", "--fix-whitespace", help="fix whitespace on rebase",
+parser.add_option("--fix-whitespace", help="fix whitespace on rebase",
default=False, action="store_true")
-parser.add_option("", "--retry", help="automatically retry if master changes",
+parser.add_option("--retry", help="automatically retry if master changes",
default=False, action="store_true")
-parser.add_option("", "--email", help="send email to the given address on failure",
+parser.add_option("--email", help="send email to the given address on failure",
type='str', default=None)
-parser.add_option("", "--email-from", help="send email from the given address",
+parser.add_option("--email-from", help="send email from the given address",
type='str', default="autobuild at samba.org")
-parser.add_option("", "--email-server", help="send email via the given server",
+parser.add_option("--email-server", help="send email via the given server",
type='str', default='localhost')
-parser.add_option("", "--always-email", help="always send email, even on success",
+parser.add_option("--always-email", help="always send email, even on success",
action="store_true")
-parser.add_option("", "--daemon", help="daemonize after initial setup",
+parser.add_option("--daemon", help="daemonize after initial setup",
action="store_true")
-parser.add_option("", "--branch", help="the branch to work on (default=master)",
+parser.add_option("--branch", help="the branch to work on (default=master)",
default="master", type='str')
-parser.add_option("", "--log-base", help="location where the logs can be found (default=cwd)",
+parser.add_option("--log-base", help="location where the logs can be found (default=cwd)",
default=gitroot, type='str')
-parser.add_option("", "--attach-logs", help="Attach logs to mails sent on success/failure?",
+parser.add_option("--attach-logs", help="Attach logs to mails sent on success/failure?",
default=False, action="store_true")
-parser.add_option("", "--restrict-tests", help="run as make test with this TESTS= regex",
+parser.add_option("--restrict-tests", help="run as make test with this TESTS= regex",
default='')
parser.add_option("--enable-coverage", dest='enable_coverage',
action="store_const", const='--enable-coverage', default='',
@@ -107,6 +108,15 @@ if options.enable_coverage:
else:
LCOV_CMD = 'echo "lcov skipped since no --enable-coverage specified"'
+if args:
+ # If we are only running specific test,
+ # do not sleep randomly to wait for it to start
+ def random_sleep(low, high):
+ return 'sleep 1'
+else:
+ def random_sleep(low, high):
+ return 'sleep {}'.format(random.randint(low, high))
+
cleanup_list = []
builddirs = {
@@ -157,337 +167,379 @@ samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=cm
samba_libs_configure_bundled_libs = " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent,!popt"
samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bundled_libs
+
+def format_option(name, value=None):
+ """Format option as str list."""
+ if value is None: # boolean option
+ return [name]
+ if not isinstance(value, list): # single value option
+ value = [value]
+ # repeatable option
+ return ['{}={}'.format(name, item) for item in value]
+
+
+def make_test(
+ cmd='make test',
+ FAIL_IMMEDIATELY=1,
+ TESTS='',
+ include_envs=None,
+ exclude_envs=None):
+
+ test_options = []
+ if include_envs:
+ test_options = format_option('--include-env', include_envs)
+ if exclude_envs:
+ test_options = format_option('--exclude-env', exclude_envs)
+ if test_options:
+ # join envs options to original test options
+ TESTS = (TESTS + ' ' + ' '.join(test_options)).strip()
+
+ _options = []
+ if FAIL_IMMEDIATELY:
+ _options.append('FAIL_IMMEDIATELY=1')
+ if TESTS:
+ _options.append("TESTS='{}'".format(TESTS))
+
+ return ' '.join([cmd] + _options)
+
+
tasks = {
- "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"),
- ("test", "make autotest", "text/plain"),
- ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
- ("clean", "make clean", "text/plain")],
+ "ctdb": [
+ ("random-sleep", random_sleep(300, 900)),
+ ("configure", "./configure " + ctdb_configure_params),
+ ("make", "make all"),
+ ("install", "make install"),
+ ("test", "make autotest"),
+ ("check-clean-tree", "../script/clean-source-tree.sh"),
+ ("clean", "make clean"),
+ ],
# We have 'test' before 'install' because, 'test' should work without 'install (runs all the other envs)'
"samba": [
- ("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 "
- "--exclude-env=schema_pair_dc "
- "--exclude-env=schema_dc "
- "'",
- "text/plain"),
- ("lcov", LCOV_CMD, "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 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_dc_schannel "
- "--include-env=nt4_member "
- "'", "text/plain"),
- ("lcov", LCOV_CMD, "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 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 "
- "--include-env=maptoguest "
- "--include-env=simpleserver "
- "'", "text/plain"),
- ("lcov", LCOV_CMD, "text/plain"),
- ("check-clean-tree", "script/clean-source-tree.sh", "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"),
- ("lcov", LCOV_CMD, "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=ad_dc_no_nss "
- "--include-env=ad_dc_no_ntlm "
- "'", "text/plain"),
- ("lcov", LCOV_CMD, "text/plain"),
- ("check-clean-tree", "script/clean-source-tree.sh", "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=vampire_dc "
- "--include-env=vampire_2000_dc "
- "--include-env=rodc "
- "'", "text/plain"),
- ("lcov", LCOV_CMD, "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"),
- ("lcov", LCOV_CMD, "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=fl2003dc "
- "--include-env=fl2008dc "
- "--include-env=fl2008r2dc "
- "'", "text/plain"),
- ("lcov", LCOV_CMD, "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"),
- ("lcov", LCOV_CMD, "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"),
- ("lcov", LCOV_CMD, "text/plain"),
- ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
-
-
- "samba-schemaupgrade": [("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=schema_dc "
- "--include-env=schema_pair_dc "
- "'", "text/plain"),
- ("lcov", LCOV_CMD, "text/plain"),
- ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
+ ("random-sleep", random_sleep(300, 900)),
+ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params),
+ ("make", "make -j"),
+ ("test", make_test(exclude_envs=[
+ "none",
+ "nt4_dc",
+ "nt4_dc_schannel",
+ "nt4_member",
+ "ad_dc",
+ "ad_dc_backup",
+ "ad_dc_ntvfs",
+ "ad_dc_default",
+ "ad_dc_slowtests",
+ "ad_dc_no_nss",
+ "ad_dc_no_ntlm",
+ "fl2003dc",
+ "fl2008dc",
+ "fl2008r2dc",
+ "ad_member",
+ "ad_member_idmap_rid",
+ "ad_member_idmap_ad",
+ "ad_member_rfc2307",
+ "chgdcpass",
+ "vampire_2000_dc",
+ "fl2000dc",
+ "fileserver",
+ "maptoguest",
+ "simpleserver",
+ "backupfromdc",
+ "restoredc",
+ "renamedc",
+ "offlinebackupdc",
--
Samba Shared Repository
More information about the samba-cvs
mailing list