]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:selftest: Correctly set smbtorture4 targets
authorAndreas Schneider <asn@samba.org>
Fri, 17 Jan 2025 10:55:15 +0000 (11:55 +0100)
committerGünther Deschner <gd@samba.org>
Mon, 27 Jan 2025 11:41:40 +0000 (11:41 +0000)
This is needed that you can correctly skip individual smbtorture4 tests.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Mon Jan 27 11:41:40 UTC 2025 on atb-devel-224

source3/selftest/tests.py

index 4540aef24b5297d2da7a5532ff3b36dbbfacb82b..437a4a8ee137bc2674755151e597eb60ab2ee292 100755 (executable)
@@ -42,13 +42,23 @@ smbtorture4_options.extend([
 
 
 def plansmbtorture4testsuite(name, env, options, description='', environ=None):
+    target = 'samba3'
+    if 'ad_dc_ntvfs' in env:
+        target = 'samba4-ntvfs'
+    elif 'ad_dc' in env:
+        target = 'samba4'
+    elif 'fl200' in env:
+        target = 'samba4'
+    elif 's4member' in env:
+        target = 'samba4'
+
     if description == '':
         modname = "samba3.%s" % (name, )
     else:
         modname = "samba3.%s %s" % (name, description)
 
     selftesthelpers.plansmbtorture4testsuite(
-        name, env, options, target='samba3', modname=modname, environ=environ)
+        name, env, options, target=target, modname=modname, environ=environ)
 
 def compare_versions(version1, version2):
     for i in range(max(len(version1),len(version2))):