s4:torture/smb2: rename 'smb2.bench-oplock' to 'smb2.bench.oplock'

We should have a toplevel 'smb2.bench' suite for all benchmark tests.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 79fb0af7e0856c5b5f5bd97176cfd5cd6c6a62e9..66b4ccb794527b335f7a6765d027fe949775f1f2 100644 (file)
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -3163,3 +3163,14 @@ struct torture_suite *torture_smb2_fileid_init(TALLOC_CTX *ctx)
 
        return suite;
 }
+
+struct torture_suite *torture_smb2_bench_init(TALLOC_CTX *ctx)
+{
+       struct torture_suite *suite = torture_suite_create(ctx, "bench");
+
+       torture_suite_add_1smb2_test(suite, "oplock", test_smb2_bench_oplock);
+
+       suite->description = talloc_strdup(suite, "SMB2-BENCH tests");
+
+       return suite;
+}

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 190538522dde9e9dc9d535c54aba98042c79946e..85c51c2e8907446cf838c9577dc4f1de165959e7 100644 (file)
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -153,6 +153,7 @@ NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
        torture_suite_add_suite(suite, torture_smb2_lock_init(suite));
        torture_suite_add_suite(suite, torture_smb2_read_init(suite));
        torture_suite_add_suite(suite, torture_smb2_aio_delay_init(suite));
+       torture_suite_add_suite(suite, torture_smb2_bench_init(suite));
        torture_suite_add_suite(suite, torture_smb2_create_init(suite));
        torture_suite_add_suite(suite, torture_smb2_twrp_init(suite));
        torture_suite_add_suite(suite, torture_smb2_fileid_init(suite));
@@ -182,7 +183,6 @@ NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
        torture_suite_add_simple_test(suite, "zero-data-ioctl",
                                      test_ioctl_zero_data);
        torture_suite_add_suite(suite, torture_smb2_rename_init(suite));
-       torture_suite_add_1smb2_test(suite, "bench-oplock", test_smb2_bench_oplock);
        torture_suite_add_suite(suite, torture_smb2_sharemode_init(suite));
        torture_suite_add_1smb2_test(suite, "hold-oplock", test_smb2_hold_oplock);
        torture_suite_add_suite(suite, torture_smb2_session_init(suite));