From 54f26cfcf2587a2b1d97f466a886fa89a116eea1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 22 Nov 2019 15:23:35 +0100 Subject: [PATCH] autobuild: Run the none env in the samba-o3 build This includes tests which should make sure that certain code is not optimized away, like memset_s(). Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Mar 9 23:42:26 UTC 2020 on sn-devel-184 --- .gitlab-ci.yml | 4 ---- script/autobuild.py | 11 ++--------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bd5dd04b4f..6114ccced99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,9 +119,6 @@ samba: samba-mitkrb5: extends: .shared_template -samba-none-env: - extends: .shared_template - samba-nopython: extends: .shared_template @@ -221,7 +218,6 @@ pages: - others - samba - samba-mitkrb5 - - samba-none-env - samba-nopython - samba-nopython-py2 - samba-xc diff --git a/script/autobuild.py b/script/autobuild.py index 68ce850740e..dc46bcdd129 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -544,7 +544,8 @@ tasks = { ("random-sleep", random_sleep(300, 900)), ("configure", "ADDITIONAL_CFLAGS='-O3 -Wp,-D_FORTIFY_SOURCE=2' ./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params), ("make", "make -j"), - ("test", make_test(cmd='make quicktest', include_envs=["ad_dc"])), + ("test", make_test(cmd='make test', include_envs=["none"])), + ("quicktest", make_test(cmd='make quicktest', include_envs=["ad_dc"])), ("lcov", LCOV_CMD), ("install", "make install"), ("check-clean-tree", "script/clean-source-tree.sh"), @@ -614,14 +615,6 @@ tasks = { ("allshared-make", "make -j"), ], - "samba-none-env": [ - ("random-sleep", random_sleep(1, 1)), - ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params), - ("make", "make -j"), - ("test", make_test(include_envs=["none"])), - ("lcov", LCOV_CMD), - ], - "samba-static": [ ("random-sleep", random_sleep(1, 1)), # build with all modules static -- 2.47.2