s4-test: use samba4-ntvfs for smbtorture file server tests

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index e90a97a67fc80f46bc2083558ac41dc9f03947fe..b5a1736fd7c7c10f7eec236c456021dfa41ee69d 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -33,12 +33,14 @@ if validate:
 else:
     validate_list = []
 
-def plansmbtorturetestsuite(name, env, options, modname=None):
+def plansmbtorturetestsuite(name, env, options, modname=None, target="samba4"):
     if modname is None:
         modname = "samba4.%s" % name
     if isinstance(options, list):
         options = " ".join(options)
-    cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name)
+    torture = smb4torture
+    torture += " --target=%s" % target
+    cmdline = "%s $LISTOPT %s %s" % (valgrindify(torture), options, name)
     plantestsuite_loadlist(modname, env, cmdline)
 
 def smb4torture_testsuites(prefix):
@@ -239,7 +241,7 @@ libsmbclient = smb4torture_testsuites("libsmbclient.")
 
 for t in base + raw + smb2 + netapi + libsmbclient:
     plansmbtorturetestsuite(t, "dc", ['//$SERVER/tmp', '-U$USERNAME%$PASSWORD'] + ntvfsargs)
-    plansmbtorturetestsuite(t, "ntvfsdc", ['//$SERVER/tmp', '-U$USERNAME%$PASSWORD'] + ntvfsargs)
+    plansmbtorturetestsuite(t, "ntvfsdc", ['//$SERVER/tmp', '-U$USERNAME%$PASSWORD'] + ntvfsargs, target="samba4-ntvfs")
 
 plansmbtorturetestsuite("raw.qfileinfo.ipc", "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')