Skip to content

Commit

Permalink
script/autobuild: re-use CACHE_SUFFIX from waflib
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Bokovoy <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
  • Loading branch information
abbra authored and abartlet committed Sep 5, 2018
1 parent 72c3ff9 commit 67ed1ea
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion script/autobuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@
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.
Expand Down Expand Up @@ -179,7 +186,10 @@
" --cross-answers=./bin-xe/cross-answers.txt --with-selftest-prefix=./bin-xe/ab" + samba_configure_params, "text/plain"),
("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"),
Expand Down

0 comments on commit 67ed1ea

Please sign in to comment.