s4 torture: Port RAW-ACLS tests to SMB2

[ira/wip.git] / source4 / torture / smb2 / smb2.c

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index f813148e1d56687c1d822f17e06479b339979953..da5d9b3e7826c728c5347e25ed46b52559ae53bd 100644 (file)
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -19,11 +19,10 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
-#include "libcli/smb2/smb2_calls.h"
 
 #include "torture/smbtorture.h"
 #include "torture/smb2/proto.h"
-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"
 
 static bool wrap_simple_1smb2_test(struct torture_context *torture_ctx,
                                   struct torture_tcase *tcase,
@@ -100,11 +99,11 @@ static bool wrap_simple_2smb2_test(struct torture_context *torture_ctx,
 }
 
 
-_PUBLIC_ struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
-                                                          const char *name,
-                                                          bool (*run)(struct torture_context *,
-                                                                      struct smb2_tree *,
-                                                                      struct smb2_tree *))
+struct torture_test *torture_suite_add_2smb2_test(struct torture_suite *suite,
+                                                 const char *name,
+                                                 bool (*run)(struct torture_context *,
+                                                             struct smb2_tree *,
+                                                             struct smb2_tree *))
 {
        struct torture_test *test;
        struct torture_tcase *tcase;
@@ -134,13 +133,19 @@ NTSTATUS torture_smb2_init(void)
        torture_suite_add_simple_test(suite, "SCANFIND", torture_smb2_find_scan);
        torture_suite_add_simple_test(suite, "GETINFO", torture_smb2_getinfo);
        torture_suite_add_simple_test(suite, "SETINFO", torture_smb2_setinfo);
-       torture_suite_add_simple_test(suite, "FIND", torture_smb2_find);
-       torture_suite_add_simple_test(suite, "CREATE", torture_smb2_create);
        torture_suite_add_suite(suite, torture_smb2_lock_init());
        torture_suite_add_suite(suite, torture_smb2_read_init());
-       torture_suite_add_simple_test(suite, "NOTIFY", torture_smb2_notify);
-       torture_suite_add_2smb2_test(suite, "PERSISTENT-HANDLES1", torture_smb2_persistent_handles1);
-       torture_suite_add_1smb2_test(suite, "OPLOCK-BATCH1", torture_smb2_oplock_batch1);
+       torture_suite_add_suite(suite, torture_smb2_create_init());
+       torture_suite_add_suite(suite, torture_smb2_acls_init());
+       torture_suite_add_suite(suite, torture_smb2_notify_init());
+       torture_suite_add_suite(suite, torture_smb2_durable_open_init());
+       torture_suite_add_suite(suite, torture_smb2_dir_init());
+       torture_suite_add_suite(suite, torture_smb2_lease_init());
+       torture_suite_add_suite(suite, torture_smb2_compound_init());
+       torture_suite_add_suite(suite, torture_smb2_oplocks_init());
+       torture_suite_add_suite(suite, torture_smb2_streams_init());
+       torture_suite_add_1smb2_test(suite, "BENCH-OPLOCK", test_smb2_bench_oplock);
+       torture_suite_add_1smb2_test(suite, "HOLD-OPLOCK", test_smb2_hold_oplock);
 
        suite->description = talloc_strdup(suite, "SMB2-specific tests");