r24735: Use torture API in more places.

[samba.git] / source4 / torture / raw / raw.c

diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c
index 67d79ef78c3092eff606baa4c24654718756bdef..85db92661b20d20e84533d156e272dadfce75567 100644 (file)
--- a/source4/torture/raw/raw.c
+++ b/source4/torture/raw/raw.c
@@ -21,6 +21,7 @@
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "torture/raw/proto.h"
+#include "torture/util.h"
 
 NTSTATUS torture_raw_init(void)
 {
@@ -31,33 +32,33 @@ NTSTATUS torture_raw_init(void)
        torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock);
        torture_suite_add_simple_test(suite, "BENCH-LOCK", torture_bench_lock);
        torture_suite_add_simple_test(suite, "BENCH-OPEN", torture_bench_open);
-       torture_suite_add_simple_test(suite, "QFSINFO", torture_raw_qfsinfo);
-       torture_suite_add_simple_test(suite, "QFILEINFO", torture_raw_qfileinfo);
-       torture_suite_add_simple_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe);
-       torture_suite_add_simple_test(suite, "SFILEINFO", torture_raw_sfileinfo);
-       torture_suite_add_simple_test(suite, "SFILEINFO-BUG", torture_raw_sfileinfo_bug);
-       torture_suite_add_simple_test(suite, "SFILEINFO-RENAME",
+       torture_suite_add_1smb_test(suite, "QFSINFO", torture_raw_qfsinfo);
+       torture_suite_add_1smb_test(suite, "QFILEINFO", torture_raw_qfileinfo);
+       torture_suite_add_1smb_test(suite, "QFILEINFO-IPC", torture_raw_qfileinfo_pipe);
+       torture_suite_add_1smb_test(suite, "SFILEINFO", torture_raw_sfileinfo);
+       torture_suite_add_1smb_test(suite, "SFILEINFO-BUG", torture_raw_sfileinfo_bug);
+       torture_suite_add_1smb_test(suite, "SFILEINFO-RENAME",
                                      torture_raw_sfileinfo_rename);
-       torture_suite_add_simple_test(suite, "SEARCH", torture_raw_search);
-       torture_suite_add_simple_test(suite, "CLOSE", torture_raw_close);
-       torture_suite_add_simple_test(suite, "OPEN", torture_raw_open);
-       torture_suite_add_simple_test(suite, "MKDIR", torture_raw_mkdir);
-       torture_suite_add_suite(suite, torture_raw_oplock());
-       torture_suite_add_simple_test(suite, "NOTIFY", torture_raw_notify);
-       torture_suite_add_simple_test(suite, "MUX", torture_raw_mux);
-       torture_suite_add_simple_test(suite, "IOCTL", torture_raw_ioctl);
-       torture_suite_add_simple_test(suite, "CHKPATH", torture_raw_chkpath);
-       torture_suite_add_simple_test(suite, "UNLINK", torture_raw_unlink);
-       torture_suite_add_simple_test(suite, "READ", torture_raw_read);
-       torture_suite_add_simple_test(suite, "WRITE", torture_raw_write);
-       torture_suite_add_simple_test(suite, "LOCK", torture_raw_lock);
-       torture_suite_add_simple_test(suite, "CONTEXT", torture_raw_context);
-       torture_suite_add_simple_test(suite, "RENAME", torture_raw_rename);
-       torture_suite_add_simple_test(suite, "SEEK", torture_raw_seek);
-       torture_suite_add_simple_test(suite, "EAS", torture_raw_eas);
-       torture_suite_add_simple_test(suite, "STREAMS", torture_raw_streams);
-       torture_suite_add_simple_test(suite, "ACLS", torture_raw_acls);
-       torture_suite_add_simple_test(suite, "COMPOSITE", torture_raw_composite);
+       torture_suite_add_suite(suite, torture_raw_search(suite));
+       torture_suite_add_1smb_test(suite, "CLOSE", torture_raw_close);
+       torture_suite_add_1smb_test(suite, "OPEN", torture_raw_open);
+       torture_suite_add_1smb_test(suite, "MKDIR", torture_raw_mkdir);
+       torture_suite_add_suite(suite, torture_raw_oplock(suite));
+       torture_suite_add_2smb_test(suite, "NOTIFY", torture_raw_notify);
+       torture_suite_add_1smb_test(suite, "MUX", torture_raw_mux);
+       torture_suite_add_1smb_test(suite, "IOCTL", torture_raw_ioctl);
+       torture_suite_add_1smb_test(suite, "CHKPATH", torture_raw_chkpath);
+       torture_suite_add_suite(suite, torture_raw_unlink(suite));
+       torture_suite_add_suite(suite, torture_raw_read(suite));
+       torture_suite_add_suite(suite, torture_raw_write(suite));
+       torture_suite_add_suite(suite, torture_raw_lock(suite));
+       torture_suite_add_1smb_test(suite, "CONTEXT", torture_raw_context);
+       torture_suite_add_suite(suite, torture_raw_rename(suite));
+       torture_suite_add_1smb_test(suite, "SEEK", torture_raw_seek);
+       torture_suite_add_1smb_test(suite, "EAS", torture_raw_eas);
+       torture_suite_add_1smb_test(suite, "STREAMS", torture_raw_streams);
+       torture_suite_add_1smb_test(suite, "ACLS", torture_raw_acls);
+       torture_suite_add_1smb_test(suite, "COMPOSITE", torture_raw_composite);
        torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide);
        torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", torture_samba3_closeerr);
        torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp);