r16331: Split out registering of multi fn tests, fix typo in name of pac suite.

(This used to be commit 9e8574ac6cd38d1ff388f0c9ff37d86b316a431e)

1 files changed, 46 insertions, 46 deletions

diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 70dab96dfa..b670b8a30a 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1795,52 +1795,52 @@ static BOOL torture_samba3_errorpaths(struct torture_context *torture)
 
 NTSTATUS torture_base_init(void)
 {
-	register_torture_op("BASE-FDPASS", run_fdpasstest, 0);
-	register_torture_op("BASE-LOCK1",  torture_locktest1,  0);
-	register_torture_op("BASE-LOCK2",  torture_locktest2,  0);
-	register_torture_op("BASE-LOCK3",  torture_locktest3,  0);
-	register_torture_op("BASE-LOCK4",  torture_locktest4,  0);
-	register_torture_op("BASE-LOCK5",  torture_locktest5,  0);
-	register_torture_op("BASE-LOCK6",  torture_locktest6,  0);
-	register_torture_op("BASE-LOCK7",  torture_locktest7,  0);
-	register_torture_op("BASE-UNLINK", torture_unlinktest, 0);
-	register_torture_op("BASE-ATTR",   run_attrtest,   0);
-	register_torture_op("BASE-TRANS2", run_trans2test, 0);
-	register_torture_op("BASE-NEGNOWAIT", run_negprot_nowait, 0);
-	register_torture_op("BASE-DIR1",  torture_dirtest1, 0);
-	register_torture_op("BASE-DIR2",  torture_dirtest2, 0);
-	register_torture_op("BASE-DENY1",  torture_denytest1, 0);
-	register_torture_op("BASE-DENY2",  torture_denytest2, 0);
-	register_torture_op("BASE-DENY3",  torture_denytest3, 0);
-	register_torture_op("BASE-DENYDOS",  torture_denydos_sharing, 0);
-	register_torture_op("BASE-NTDENY1",  NULL, torture_ntdenytest1);
-	register_torture_op("BASE-NTDENY2",  torture_ntdenytest2, 0);
-	register_torture_op("BASE-TCON",  run_tcon_test, 0);
-	register_torture_op("BASE-TCONDEV",  run_tcon_devtype_test, 0);
-	register_torture_op("BASE-VUID", run_vuidtest, 0);
-	register_torture_op("BASE-RW1",  run_readwritetest, 0);
-	register_torture_op("BASE-OPEN", run_opentest, 0);
-	register_torture_op("BASE-DEFER_OPEN", NULL, run_deferopen);
-	register_torture_op("BASE-XCOPY", run_xcopy, 0);
-	register_torture_op("BASE-IOMETER", run_iometer, 0);
-	register_torture_op("BASE-RENAME", torture_test_rename, 0);
-	register_torture_op("BASE-DELETE", torture_test_delete, 0);
-	register_torture_op("BASE-PROPERTIES", torture_test_properties, 0);
-	register_torture_op("BASE-MANGLE", torture_mangle, 0);
-	register_torture_op("BASE-OPENATTR", torture_openattrtest, 0);
-	register_torture_op("BASE-CHARSET", torture_charset, 0);
-	register_torture_op("BASE-CHKPATH",  torture_chkpath_test, 0);
-	register_torture_op("BASE-SECLEAK",  torture_sec_leak, 0);
-	register_torture_op("BASE-DISCONNECT",  torture_disconnect, 0);
-	register_torture_op("BASE-DELAYWRITE", torture_delay_write, 0);
-	register_torture_op("BASE-SAMBA3ERROR", torture_samba3_errorpaths, 0);
-
-	register_torture_op("SCAN-CASETABLE", torture_casetable, 0);
-	register_torture_op("SCAN-UTABLE", torture_utable, 0);
-	register_torture_op("SCAN-SMB", torture_smb_scan, 0);
-	register_torture_op("SCAN-ALIASES", torture_trans2_aliases, 0);
-	register_torture_op("SCAN-TRANS2", torture_trans2_scan, 0);
-	register_torture_op("SCAN-NTTRANS", torture_nttrans_scan, 0);
+	register_torture_op("BASE-FDPASS", run_fdpasstest);
+	register_torture_op("BASE-LOCK1",  torture_locktest1);
+	register_torture_op("BASE-LOCK2",  torture_locktest2);
+	register_torture_op("BASE-LOCK3",  torture_locktest3);
+	register_torture_op("BASE-LOCK4",  torture_locktest4);
+	register_torture_op("BASE-LOCK5",  torture_locktest5);
+	register_torture_op("BASE-LOCK6",  torture_locktest6);
+	register_torture_op("BASE-LOCK7",  torture_locktest7);
+	register_torture_op("BASE-UNLINK", torture_unlinktest);
+	register_torture_op("BASE-ATTR",   run_attrtest);
+	register_torture_op("BASE-TRANS2", run_trans2test);
+	register_torture_op("BASE-NEGNOWAIT", run_negprot_nowait);
+	register_torture_op("BASE-DIR1",  torture_dirtest1);
+	register_torture_op("BASE-DIR2",  torture_dirtest2);
+	register_torture_op("BASE-DENY1",  torture_denytest1);
+	register_torture_op("BASE-DENY2",  torture_denytest2);
+	register_torture_op("BASE-DENY3",  torture_denytest3);
+	register_torture_op("BASE-DENYDOS",  torture_denydos_sharing);
+	register_torture_multi_op("BASE-NTDENY1", torture_ntdenytest1);
+	register_torture_op("BASE-NTDENY2",  torture_ntdenytest2);
+	register_torture_op("BASE-TCON",  run_tcon_test);
+	register_torture_op("BASE-TCONDEV",  run_tcon_devtype_test);
+	register_torture_op("BASE-VUID", run_vuidtest);
+	register_torture_op("BASE-RW1",  run_readwritetest);
+	register_torture_op("BASE-OPEN", run_opentest);
+	register_torture_multi_op("BASE-DEFER_OPEN", run_deferopen);
+	register_torture_op("BASE-XCOPY", run_xcopy);
+	register_torture_op("BASE-IOMETER", run_iometer);
+	register_torture_op("BASE-RENAME", torture_test_rename);
+	register_torture_op("BASE-DELETE", torture_test_delete);
+	register_torture_op("BASE-PROPERTIES", torture_test_properties);
+	register_torture_op("BASE-MANGLE", torture_mangle);
+	register_torture_op("BASE-OPENATTR", torture_openattrtest);
+	register_torture_op("BASE-CHARSET", torture_charset);
+	register_torture_op("BASE-CHKPATH",  torture_chkpath_test);
+	register_torture_op("BASE-SECLEAK",  torture_sec_leak);
+	register_torture_op("BASE-DISCONNECT",  torture_disconnect);
+	register_torture_op("BASE-DELAYWRITE", torture_delay_write);
+	register_torture_op("BASE-SAMBA3ERROR", torture_samba3_errorpaths);
+
+	register_torture_op("SCAN-CASETABLE", torture_casetable);
+	register_torture_op("SCAN-UTABLE", torture_utable);
+	register_torture_op("SCAN-SMB", torture_smb_scan);
+	register_torture_op("SCAN-ALIASES", torture_trans2_aliases);
+	register_torture_op("SCAN-TRANS2", torture_trans2_scan);
+	register_torture_op("SCAN-NTTRANS", torture_nttrans_scan);
 
 	return NT_STATUS_OK;
 }