summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2018-09-03 13:07:23 +0300
committerAndrew Bartlett <abartlet@samba.org>2018-09-05 06:37:28 +0200
commit67ed1ea6c468ce537e61183771dbc76241acfe67 (patch)
treea920d9134b0d0e38f9cab6069cefb249a054d52e
parent72c3ff9ae2090652e9f3e77374494103e1fd2723 (diff)
downloadsamba-67ed1ea6c468ce537e61183771dbc76241acfe67.tar.gz
script/autobuild: re-use CACHE_SUFFIX from waflib
Signed-off-by: Alexander Bokovoy <ab@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rwxr-xr-xscript/autobuild.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index c569f9de122..d389838286b 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -19,6 +19,13 @@ from email.mime.multipart import MIMEMultipart
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.
@@ -179,7 +186,10 @@ tasks = {
" --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"),