selftest: Only run samba.tests.smb3unix in developer mode

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Jan 26 13:13:50 UTC 2023 on atb-devel-224

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 0eb63fe3f368d21524e6c6eda294001e50df2832..05a5ae20abec45311270e8ff22edc8aa9d99f3d5 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4849,6 +4849,10 @@ uint32_t lp_get_async_dns_timeout(void)
 
 bool lp_smb3_unix_extensions(void)
 {
+       /*
+        * FIXME: If this gets always enabled, check source3/selftest/tests.py
+        * and source3/wscript for HAVE_SMB3_UNIX_EXTENSIONS.
+        */
 #if defined(DEVELOPER)
        return lp__smb3_unix_extensions();
 #else

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 8039b4a8171b9eb9277742d78d21a801fdd9f747..187f3ccd9c00e1f8c77fb77d204a78ca5851182a 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -92,6 +92,8 @@ have_inotify = ("HAVE_INOTIFY" in config_hash)
 have_ldwrap = ("HAVE_LDWRAP" in config_hash)
 with_pthreadpool = ("WITH_PTHREADPOOL" in config_hash)
 
+have_smb3_unix_extensions = ("HAVE_SMB3_UNIX_EXTENSIONS" in config_hash)
+
 def is_module_enabled(module):
     if module in config_hash["STRING_SHARED_MODULES"]:
         return True
@@ -1706,7 +1708,8 @@ for t in CLUSTERED_LOCAL_TESTS:
          smbtorture3,
          "-N 1000 -o 2000"])
 
-planpythontestsuite("fileserver", "samba.tests.smb3unix")
+if have_smb3_unix_extensions:
+    planpythontestsuite("fileserver", "samba.tests.smb3unix")
 planpythontestsuite("fileserver", "samba.tests.reparsepoints")
 planpythontestsuite("fileserver_smb1", "samba.tests.smb2symlink")
 planpythontestsuite("fileserver_smb1", "samba.tests.smb1posix")

diff --git a/source3/wscript b/source3/wscript
index e77cd127e600f8c2cd17795a3976ea8c1e5c8d3e..0dbf02ed530f46db1633b7197ec36fd634fec165 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -111,6 +111,7 @@ def configure(conf):
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
         conf.env.developer = True
+        conf.DEFINE('HAVE_SMB3_UNIX_EXTENSIONS', '1')
 
     if sys.platform != 'openbsd5':
         conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)