diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2018-07-30 18:17:14 +1200 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:27 +0200 |
commit | ba0827b560c8165bcbb4017a6377778934ad9bb9 (patch) | |
tree | bf622e8cc16f566b052b3fb8be1fda6274dd0695 /script | |
parent | 562411bd9587bdd011bd70e25f9763c38a8af401 (diff) | |
download | samba-ba0827b560c8165bcbb4017a6377778934ad9bb9.tar.gz |
PEP8: fix E203: whitespace before ':'
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'script')
-rwxr-xr-x | script/autobuild.py | 74 | ||||
-rw-r--r-- | script/generate_param.py | 2 |
2 files changed, 38 insertions, 38 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index f52821915cb..4a27e1b5255 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -24,30 +24,30 @@ os.environ['TDB_NO_FSYNC'] = '1' cleanup_list = [] builddirs = { - "ctdb" : "ctdb", - "samba" : ".", - "samba-nt4" : ".", - "samba-fileserver" : ".", - "samba-xc" : ".", - "samba-o3" : ".", - "samba-ctdb" : ".", - "samba-libs" : ".", - "samba-static" : ".", - "samba-test-only" : ".", - "samba-none-env" : ".", - "samba-ad-dc" : ".", - "samba-ad-dc-2" : ".", - "samba-systemkrb5" : ".", - "samba-nopython" : ".", - "ldb" : "lib/ldb", - "tdb" : "lib/tdb", - "talloc" : "lib/talloc", - "replace" : "lib/replace", - "tevent" : "lib/tevent", - "pidl" : "pidl", - "pass" : ".", - "fail" : ".", - "retry" : "." + "ctdb": "ctdb", + "samba": ".", + "samba-nt4": ".", + "samba-fileserver": ".", + "samba-xc": ".", + "samba-o3": ".", + "samba-ctdb": ".", + "samba-libs": ".", + "samba-static": ".", + "samba-test-only": ".", + "samba-none-env": ".", + "samba-ad-dc": ".", + "samba-ad-dc-2": ".", + "samba-systemkrb5": ".", + "samba-nopython": ".", + "ldb": "lib/ldb", + "tdb": "lib/tdb", + "talloc": "lib/talloc", + "replace": "lib/replace", + "tevent": "lib/tevent", + "pidl": "pidl", + "pass": ".", + "fail": ".", + "retry": "." } defaulttasks = ["ctdb", @@ -91,7 +91,7 @@ else: extra_python = "--extra-python=/usr/bin/python3" tasks = { - "ctdb" : [("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"), + "ctdb": [("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"), ("configure", "./configure " + ctdb_configure_params, "text/plain"), ("make", "make all", "text/plain"), ("install", "make install", "text/plain"), @@ -100,7 +100,7 @@ tasks = { ("clean", "make clean", "text/plain")], # We have 'test' before 'install' because, 'test' should work without 'install (runs ad_dc_ntvfs and all the other envs)' - "samba" : [("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"), + "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 " @@ -122,7 +122,7 @@ tasks = { ("clean", "make clean", "text/plain")], # We split out this so the isolated nt4_dc tests do not wait for ad_dc or ad_dc_ntvfs tests (which are long) - "samba-nt4" : [("random-sleep", "script/random-sleep.sh 60 600", "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"), @@ -131,14 +131,14 @@ tasks = { ("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"), + "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"), ("make", "make -j", "text/plain"), ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--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"), + "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='" @@ -151,18 +151,18 @@ tasks = { ("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-2" : [("random-sleep", "script/random-sleep.sh 60 600", "text/plain"), + "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"), ("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"), + "samba-test-only": [("configure", "./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"), ("make", "make -j", "text/plain"), ("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 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" \ " --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xe/ab" + samba_configure_params, "text/plain"), @@ -171,7 +171,7 @@ tasks = { ("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")], # 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 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"), @@ -179,7 +179,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 60 600", "text/plain"), # make sure we have tdb around: ("tdb-configure", "cd lib/tdb && PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=NONE --abi-check --enable-debug -C ${PREFIX}", "text/plain"), @@ -362,7 +362,7 @@ tasks = { ("distcheck", "make distcheck", "text/plain"), ("clean", "make clean", "text/plain")], - "pidl" : [ + "pidl": [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"), ("configure", "perl Makefile.PL PREFIX=${PREFIX_DIR}", "text/plain"), ("touch", "touch *.yp", "text/plain"), @@ -374,8 +374,8 @@ tasks = { ("clean", "make clean", "text/plain")], # these are useful for debugging autobuild - 'pass' : [("pass", 'echo passing && /bin/true', "text/plain")], - 'fail' : [("fail", 'echo failing && /bin/false', "text/plain")] + 'pass': [("pass", 'echo passing && /bin/true', "text/plain")], + 'fail': [("fail", 'echo failing && /bin/false', "text/plain")] } def do_print(msg): diff --git a/script/generate_param.py b/script/generate_param.py index b610f6fb5e8..3ef40038774 100644 --- a/script/generate_param.py +++ b/script/generate_param.py @@ -98,7 +98,7 @@ def iterate_all(path): 'enumlist' : enumlist, 'handler' : handler, 'deprecated' : deprecated, - 'synonyms' : synonyms} + 'synonyms' : synonyms } # map doc attributes to a section of the generated function context_dict = {"G": "_GLOBAL", "S": "_LOCAL"} |