from distutils.sysconfig import get_python_lib
import platform
+try:
+ from waflib.Build import CACHE_SUFFIX
+except ImportError:
+ sys.path.insert(0, "./third_party/waf")
+ from waflib.Build import CACHE_SUFFIX
+
+
os.environ["PYTHONUNBUFFERED"] = "1"
# This speeds up testing remarkably.
builddirs = {
"ctdb": "ctdb",
"samba": ".",
+ "samba-py3": ".",
"samba-nt4": ".",
+ "samba-nt4-py3": ".",
"samba-fileserver": ".",
"samba-xc": ".",
"samba-o3": ".",
"samba-ctdb": ".",
"samba-libs": ".",
+ "samba-libs-py3": ".",
"samba-static": ".",
- "samba-test-only": ".",
"samba-none-env": ".",
"samba-ad-dc": ".",
+ "samba-ad-dc-py3": ".",
"samba-ad-dc-2": ".",
+ "samba-ad-dc-2-py3": ".",
"samba-systemkrb5": ".",
"samba-nopython": ".",
+ "samba-buildpy3-only": ".",
+ "samba-purepy3-none-env": ".",
"ldb": "lib/ldb",
"tdb": "lib/tdb",
"talloc": "lib/talloc",
"replace": "lib/replace",
"tevent": "lib/tevent",
- "pidl": "pidl",
- "pass": ".",
- "fail": ".",
- "retry": "."
+ "pidl": "pidl"
}
-defaulttasks = ["ctdb",
- "samba",
- "samba-nt4",
- "samba-fileserver",
- "samba-xc",
- "samba-o3",
- "samba-ctdb",
- "samba-libs",
- "samba-static",
- "samba-none-env",
- "samba-ad-dc",
- "samba-ad-dc-2",
- "samba-systemkrb5",
- "samba-nopython",
- "ldb",
- "tdb",
- "talloc",
- "replace",
- "tevent",
- "pidl"]
+defaulttasks = builddirs.keys()
if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1":
defaulttasks.remove("samba-o3")
"samba": [("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 "
+ "TESTS='${PY3_ONLY}"
+ "--exclude-env=none "
"--exclude-env=nt4_dc "
"--exclude-env=nt4_member "
"--exclude-env=ad_dc "
+ "--exclude-env=ad_dc_no_nss "
"--exclude-env=fl2003dc "
"--exclude-env=fl2008r2dc "
"--exclude-env=ad_member "
"--exclude-env=chgdcpass "
"--exclude-env=vampire_2000_dc "
"--exclude-env=fl2000dc "
- "--exclude-env=fileserver'",
+ "--exclude-env=fileserver "
+ "--exclude-env=backupfromdc "
+ "--exclude-env=restoredc "
+ "--exclude-env=renamedc "
+ "--exclude-env=offlinebackupdc "
+ "--exclude-env=labdc "
+ "'",
"text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
"samba-nt4": [("random-sleep", "script/random-sleep.sh 60 600", "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"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='${PY3_ONLY}"
+ "--include-env=nt4_dc --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")],
# We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long)
"samba-fileserver": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
- ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json-audit --with-selftest-prefix=./bin/ab" + samba_configure_params, "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"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='${PY3_ONLY}"
+ "--include-env=fileserver'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
# We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long)
"samba-ad-dc": [("random-sleep", "script/random-sleep.sh 60 600", "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='"
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='${PY3_ONLY}"
"--include-env=ad_dc "
"--include-env=fl2003dc "
"--include-env=fl2008r2dc "
"samba-ad-dc-2": [("random-sleep", "script/random-sleep.sh 60 600", "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 --include-env=vampire_2000_dc --include-env=fl2000dc'", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='${PY3_ONLY}"
+ "--include-env=chgdcpass "
+ "--include-env=vampire_2000_dc "
+ "--include-env=fl2000dc "
+ "--include-env=ad_dc_no_nss "
+ "--include-env=backupfromdc "
+ "--include-env=restoredc "
+ "--include-env=renamedc "
+ "--include-env=offlinebackupdc "
+ "--include-env=labdc "
+ "'",
+ "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"),
# Test cross-compile infrastructure
"samba-xc": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
("configure-native", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
- ("configure-cross-execute", "./configure.developer -b ./bin-xe --cross-compile --cross-execute=script/identity_cc.sh" \
+ ("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"),
- ("configure-cross-answers", "./configure.developer -b ./bin-xa --cross-compile" \
+ ("configure-cross-answers", "./configure.developer --out ./bin-xa --cross-compile" \
" --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xa/ab" + samba_configure_params, "text/plain"),
- ("compare-results", "script/compare_cc_results.py ./bin/c4che/default.cache.py ./bin-xe/c4che/default.cache.py ./bin-xa/c4che/default.cache.py", "text/plain")],
+ ("compare-results", "script/compare_cc_results.py "
+ "./bin/c4che/default{} "
+ "./bin-xe/c4che/default{} "
+ "./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"),
("configure", "ADDITIONAL_CFLAGS='-O3' ./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 TESTS='--include-env=ad_dc'", "text/plain"),
+ ("test", "make quicktest FAIL_IMMEDIATELY=1 "
+ "TESTS='${PY3_ONLY}"
+ "--include-env=ad_dc'", "text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
("clean", "make clean", "text/plain"),
("ctdb-clean", "cd ./ctdb && make clean", "text/plain")],
- "samba-libs" : [
+ "samba-libs": [
("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
("talloc-configure", "cd lib/talloc && " + samba_libs_configure_libs, "text/plain"),
("talloc-make", "cd lib/talloc && make", "text/plain"),
("allshared-configure", samba_libs_configure_samba + " --with-shared-modules=ALL", "text/plain"),
("allshared-make", "make -j", "text/plain")],
- "samba-none-env" : [
+ "samba-none-env": [
("random-sleep", "script/random-sleep.sh 60 600", "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=none'",
+ "TESTS='${PY3_ONLY}"
+ "--include-env=none'",
"text/plain")],
- "samba-static" : [
+ "samba-static": [
("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
# build with all modules static
("allstatic-configure", "./configure.developer " + samba_configure_params + " --with-static-modules=ALL", "text/plain"),
("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=talloc,tdb,pytdb,ldb,pyldb,tevent,pytevent --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd", "text/plain"),
("nonshared-make", "make -j", "text/plain")],
- "samba-systemkrb5" : [
+ "samba-systemkrb5": [
("random-sleep", "script/random-sleep.sh 60 600", "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
# via "make test TESTS=sometests"
- ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=ktest'", "text/plain"),
+ ("test", "make test FAIL_IMMEDIATELY=1 "
+ "TESTS='${PY3_ONLY}"
+ "--include-env=ktest'", "text/plain"),
("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")
# --disable-python is set (rather than major work being done to
# support this environment). The target here is for vendors
# shipping a minimal smbd.
- "samba-nopython" : [
+ "samba-nopython": [
("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
("configure", "./configure.developer --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc", "text/plain"),
("make", "make -j", "text/plain"),
- "ldb" : [
+ "ldb": [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
("make", "make", "text/plain"),
("distcheck", "make distcheck", "text/plain"),
("clean", "make clean", "text/plain")],
- "tdb" : [
+ "tdb": [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
("make", "make", "text/plain"),
("distcheck", "make distcheck", "text/plain"),
("clean", "make clean", "text/plain")],
- "talloc" : [
+ "talloc": [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
("make", "make", "text/plain"),
("distcheck", "make distcheck", "text/plain"),
("clean", "make clean", "text/plain")],
- "replace" : [
+ "replace": [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
("make", "make", "text/plain"),
("distcheck", "make distcheck", "text/plain"),
("clean", "make clean", "text/plain")],
- "tevent" : [
+ "tevent": [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
("make", "make", "text/plain"),
("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "text/plain")],
+ "samba-buildpy3-only": [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("configure", "PYTHON='python3' ./configure.developer --with-selftest-prefix=./bin/ab " + samba_configure_params, "text/plain"),
+ ("make", "PYTHON='python3' make -j", "text/plain"),
+ ("install", "PYTHON='python3' make install", "text/plain"),
+ ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+ ("clean", "PYTHON='python3' make clean", "text/plain")],
+
+ "samba-purepy3-none-env": [
+ ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+ ("configure", "PYTHON='python3' ./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("make", "PYTHON='python3' make -j", "text/plain"),
+ ("test", "PYTHON='python3' make test "
+ "FAIL_IMMEDIATELY=1 "
+ "TESTS='${PY3_ONLY}"
+ "--include-env=none'",
+ "text/plain")],
+
# these are useful for debugging autobuild
'pass': [("pass", 'echo passing && /bin/true', "text/plain")],
'fail': [("fail", 'echo failing && /bin/false', "text/plain")]
+
+
}
if show:
do_print("Running: '%s' in '%s'" % (cmd, dir))
if output:
- return Popen([cmd], shell=True, stdout=PIPE, cwd=dir).communicate()[0]
+ return Popen([cmd], shell=True, stdout=PIPE, cwd=dir, close_fds=True).communicate()[0]
elif checkfail:
return check_call(cmd, shell=True, cwd=dir)
else:
class builder(object):
'''handle build of one directory'''
- def __init__(self, name, sequence, cp=True):
+ def __init__(self, name, sequence, cp=True, py3=False):
self.name = name
- self.dir = builddirs[name]
+ self.py3 = py3
+ if name in builddirs:
+ self.dir = builddirs[name]
+ else:
+ self.dir = "."
self.tag = self.name.replace('/', '_')
self.sequence = sequence
(self.stage, self.cmd, self.output_mime_type) = self.sequence[self.next]
self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(standard_lib=1, prefix=self.prefix))
self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix)
- self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "%s" % extra_python)
+ if self.py3:
+ self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "%s" % extra_python)
+ # The trailing space is important
+ self.cmd = self.cmd.replace("${PY3_ONLY}", "python3 ")
+ else:
+ self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "")
+ self.cmd = self.cmd.replace("${PY3_ONLY}", "")
self.cmd = self.cmd.replace("${PREFIX_DIR}", "%s" % self.prefix)
self.cmd = self.cmd.replace("${TESTS}", options.restrict_tests)
# if self.output_mime_type == "text/x-subunit":
# self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
- do_print('%s: [%s] Running %s' % (self.name, self.stage, self.cmd))
cwd = os.getcwd()
os.chdir("%s/%s" % (self.sdir, self.dir))
+ do_print('%s: [%s] Running %s in %r' % (self.name, self.stage, self.cmd, os.getcwd()))
self.proc = Popen(self.cmd, shell=True,
+ close_fds=True,
stdout=self.stdout, stderr=self.stderr, stdin=self.stdin)
os.chdir(cwd)
self.next += 1
os.environ['AUTOBUILD_RANDOM_SLEEP_OVERRIDE'] = '1'
for n in tasknames:
- b = builder(n, tasks[n], cp=n is not "pidl")
+ if n not in tasks and n.endswith("-py3"):
+ b = builder(n,
+ tasks[n[:-4]],
+ cp=n is not "pidl",
+ py3=True)
+ else:
+ b = builder(n, tasks[n], cp=n is not "pidl")
self.tlist.append(b)
if options.retry:
rebase_remote = "rebaseon"
os.unlink(b.stderr_path)
def start_tail(self):
- cwd = os.getcwd()
- cmd = "tail -f *.stdout *.stderr"
- os.chdir(gitroot)
- self.tail_proc = Popen(cmd, shell=True)
- os.chdir(cwd)
+ cmd = ["tail", "-f"]
+ for b in self.tlist:
+ cmd.append(b.stdout_path)
+ cmd.append(b.stderr_path)
+ self.tail_proc = Popen(cmd, close_fds=True)
def cleanup():
return
run_cmd("stat %s || true" % test_tmpdir, show=True)
run_cmd("stat %s" % testbase, show=True)
- do_print("Cleaning up ....")
+ do_print("Cleaning up %r" % cleanup_list)
for d in cleanup_list:
run_cmd("rm -rf %s" % d)
def send_email(subject, text, log_tar):
if options.email is None:
do_print("not sending email because the recipient is not set")
- do_print("the text content would have been:\n\nSubject: %s\n\nTs" %
+ do_print("the text content would have been:\n\nSubject: %s\n\n%s" %
(subject, text))
return
outer = MIMEMultipart()
git.samba.org / amitay / samba.git / blobdiff