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 <[email protected]> Reviewed-by: Andrew Bartlett <[email protected]> Autobuild-User(master): Andrew Bartlett <[email protected]> Autobuild-Date(master): Mon Mar 9 23:42:26 UTC 2020 on sn-devel-184
httpstorm · Mar 9, 2020 · 54f26cf · 54f26cf
1 parent 609c990
commit 54f26cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git 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
@@ -544,7 +544,8 @@ def make_test(
         ("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 @@ def make_test(
         ("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