From: Ralph Boehme <slow@samba.org>
Date: Tue, 30 Jul 2019 10:00:18 +0000 (+0200)
Subject: selftest: split fileserver testenv into simpleserver and fileserver
X-Git-Tag: talloc-2.3.1~441
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0e8dd1a08698884209873bb84002d7b34db016c;p=thirdparty%2Fsamba.git

selftest: split fileserver testenv into simpleserver and fileserver

The simpleserver testenv continues to be built with minimal
dependencies. fileserver otoh will be built with bells and whistles including
JSON which I need for using the env as target for Spotlight tests.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01838b93d72..62a3c7fcb5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,6 +174,9 @@ samba-ad-dc-ntvfs:
 samba-ad-dc-backup:
   extends: .private_template
 
+samba-simpleserver:
+  extends: .private_template
+
 samba-fileserver:
   extends: .private_template
 
diff --git a/script/autobuild.py b/script/autobuild.py
index 0560622ee91..29e6234ded9 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -280,14 +280,24 @@ tasks = {
         ("clean", "make clean"),
         ],
 
-    "samba-fileserver": [
+    "samba-simpleserver": [
         ("random-sleep", random_sleep(300, 900)),
         ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json --with-selftest-prefix=./bin/ab" + samba_configure_params),
         ("make", "make -j"),
+        ("test", make_test(include_envs=[
+            "simpleserver",
+            ])),
+        ("lcov", LCOV_CMD),
+        ("check-clean-tree", "script/clean-source-tree.sh"),
+        ],
+
+    "samba-fileserver": [
+        ("random-sleep", random_sleep(300, 900)),
+        ("configure", "./configure.developer --without-ad-dc --with-selftest-prefix=./bin/ab" + samba_configure_params),
+        ("make", "make -j"),
         ("test", make_test(include_envs=[
             "fileserver",
             "maptoguest",
-            "simpleserver",
             ])),
         ("lcov", LCOV_CMD),
         ("check-clean-tree", "script/clean-source-tree.sh"),