tasks = {
"ctdb" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
- ("autogen", "./autogen.sh", "text/plain"),
- ("configure", "./configure ${PREFIX} --enable-socket-wrapper ", "text/plain"),
+ ("configure", "./configure ${PREFIX}", "text/plain"),
("make", "make all", "text/plain"),
("install", "make install", "text/plain"),
("test", "make autotest", "text/plain"),
("clean", "make clean", "text/plain") ],
# We have 'test' before 'install' because, 'test' should work without 'install'
- "samba" : [ ("configure", "./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab", "text/plain"),
+ "samba" : [ ("configure", "./configure.developer --picky-developer ${PREFIX} --with-selftest-prefix=./bin/ab", "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1", "text/plain"),
("install", "make install", "text/plain"),
("tdb-make", "cd lib/tdb && make", "text/plain"),
("tdb-install", "cd lib/tdb && make install", "text/plain"),
- # build and install ctdb:
- ("ctdb-autogen", "cd ./ctdb && ./autogen.sh", "text/plain"),
- ("ctdb-configure", "cd ./ctdb && ./configure ${PREFIX} --enable-socket-wrapper --with-included-tdb=no", "text/plain"),
- ("ctdb-make", "cd ./ctdb && make all", "text/plain"),
- ("ctdb-install", "cd ./ctdb && make install", "text/plain"),
- ("ctdb-header-ls", "ls ${PREFIX_DIR}/include/ctdb.h", "text/plain"),
# build samba with cluster support against this ctdb:
- ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --with-ctdb-dir=${PREFIX_DIR} --bundled-libraries=!tdb", "text/plain"),
+ ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure.developer --picky-developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --bundled-libraries=!tdb", "text/plain"),
("samba-make", "make", "text/plain"),
("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"),
("samba-install", "make install", "text/plain"),
+ ("ctdb-check", "test -e ${PREFIX_DIR}/sbin/ctdbd", "text/plain"),
# clean up:
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ntdb,!pyntdb,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
("make", "make", "text/plain"),
- ("install", "make install", "text/plain")],
+ ("install", "make install", "text/plain"),
+ ("dist", "make dist", "text/plain")],
"ldb" : [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
show=True, dir=test_master)
run_cmd("git fetch %s" % rebase_remote, show=True, dir=test_master)
if options.fix_whitespace:
- run_cmd("git rebase --whitespace=fix %s/%s" %
+ run_cmd("git rebase --force-rebase --whitespace=fix %s/%s" %
(rebase_remote, rebase_branch),
show=True, dir=test_master)
else:
- run_cmd("git rebase %s/%s" %
+ run_cmd("git rebase --force-rebase %s/%s" %
(rebase_remote, rebase_branch),
show=True, dir=test_master)
diff = run_cmd("git --no-pager diff HEAD %s/%s" %