git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb5b1c8)
s4:torture: Fix C99 initializers for vfs fruit tests
authorAndreas Schneider <asn@samba.org>
Tue, 8 Jan 2019 10:26:16 +0000 (11:26 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Mon, 28 Jan 2019 09:29:26 +0000 (10:29 +0100)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
source4/torture/vfs/fruit.c patch | blob | history

diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index 3b01cf876d083aeaabfdbf1206f1e99b843d2780..1296ba82e93a9b2f6fc654605ed89966d24a140c 100644 (file)
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -5998,107 +5998,131 @@ static bool test_empty_stream(struct torture_context *tctx,
        struct tcase tcase_afpinfo_ro = (struct tcase) {
                .name = BASEDIR "\\file" AFPINFO_STREAM,
                .access = SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE,
-               .create.size = 60,
-               .create.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.num_streams_open_handle = 1,
-               .create.num_streams_closed_handle = 1,
-               .create.streams_open_handle = {"::$DATA"},
-               .create.streams_closed_handle = {"::$DATA"},
+               .create = {
+                       .size = 60,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
        };
        struct tcase tcase_afpinfo_rw = (struct tcase) {
                .name = BASEDIR "\\file" AFPINFO_STREAM,
                .access = SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE|SEC_FILE_WRITE_DATA|SEC_STD_DELETE,
                .write_data = ai_blob,
                .write_size = AFP_INFO_SIZE,
-               .create.size = 60,
-               .create.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.num_streams_open_handle = 1,
-               .create.num_streams_closed_handle = 1,
-               .create.streams_open_handle = {"::$DATA"},
-               .create.streams_closed_handle = {"::$DATA"},
-               .write.size = 60,
-               .write.initial_status = NT_STATUS_OK,
-               .write.final_status = NT_STATUS_OK,
-               .write.num_streams_open_handle = 2,
-               .write.num_streams_closed_handle = 2,
-               .write.streams_open_handle = {"::$DATA", AFPINFO_STREAM},
-               .write.streams_closed_handle = {"::$DATA", AFPINFO_STREAM},
-               .overwrite.size = 60,
-               .overwrite.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .overwrite.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .overwrite.num_streams_open_handle = 1,
-               .overwrite.num_streams_closed_handle = 1,
-               .overwrite.streams_open_handle = {"::$DATA"},
-               .overwrite.streams_closed_handle = {"::$DATA"},
-               .eof.size = 60,
-               .eof.initial_status = NT_STATUS_OK,
-               .eof.final_status = NT_STATUS_OK,
-               .eof.num_streams_open_handle = 2,
-               .eof.num_streams_closed_handle = 2,
-               .eof.streams_open_handle = {"::$DATA", AFPINFO_STREAM},
-               .eof.streams_closed_handle = {"::$DATA", AFPINFO_STREAM},
-               .doc.size = 60,
-               .doc.initial_status = NT_STATUS_DELETE_PENDING,
-               .doc.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .doc.num_streams_open_handle = 2,
-               .doc.num_streams_closed_handle = 1,
-               .doc.streams_open_handle = {"::$DATA", AFPINFO_STREAM},
-               .doc.streams_closed_handle = {"::$DATA"},
+               .create = {
+                       .size = 60,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
+               .write = {
+                       .size = 60,
+                       .initial_status = NT_STATUS_OK,
+                       .final_status = NT_STATUS_OK,
+                       .num_streams_open_handle = 2,
+                       .num_streams_closed_handle = 2,
+                       .streams_open_handle = {"::$DATA", AFPINFO_STREAM},
+                       .streams_closed_handle = {"::$DATA", AFPINFO_STREAM},
+               },
+               .overwrite = {
+                       .size = 60,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
+               .eof = {
+                       .size = 60,
+                       .initial_status = NT_STATUS_OK,
+                       .final_status = NT_STATUS_OK,
+                       .num_streams_open_handle = 2,
+                       .num_streams_closed_handle = 2,
+                       .streams_open_handle = {"::$DATA", AFPINFO_STREAM},
+                       .streams_closed_handle = {"::$DATA", AFPINFO_STREAM},
+               },
+               .doc = {
+                       .size = 60,
+                       .initial_status = NT_STATUS_DELETE_PENDING,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 2,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA", AFPINFO_STREAM},
+                       .streams_closed_handle = {"::$DATA"},
+               },
        };
 
        struct tcase tcase_afpresource_ro = (struct tcase) {
                .name = BASEDIR "\\file" AFPRESOURCE_STREAM,
                .access = SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE,
-               .create.size = 0,
-               .create.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.num_streams_open_handle = 1,
-               .create.num_streams_closed_handle = 1,
-               .create.streams_open_handle = {"::$DATA"},
-               .create.streams_closed_handle = {"::$DATA"},
+               .create = {
+                       .size = 0,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
        };
        struct tcase tcase_afpresource_rw = (struct tcase) {
                .name = BASEDIR "\\file" AFPRESOURCE_STREAM,
                .access = SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE|SEC_FILE_WRITE_DATA|SEC_STD_DELETE,
                .write_data = "foo",
                .write_size = 3,
-               .create.size = 0,
-               .create.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.num_streams_open_handle = 1,
-               .create.num_streams_closed_handle = 1,
-               .create.streams_open_handle = {"::$DATA"},
-               .create.streams_closed_handle = {"::$DATA"},
-               .write.size = 3,
-               .write.initial_status = NT_STATUS_OK,
-               .write.final_status = NT_STATUS_OK,
-               .write.num_streams_open_handle = 2,
-               .write.num_streams_closed_handle = 2,
-               .write.streams_open_handle = {"::$DATA", AFPRESOURCE_STREAM},
-               .write.streams_closed_handle = {"::$DATA", AFPRESOURCE_STREAM},
-               .overwrite.size = 0,
-               .overwrite.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .overwrite.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .overwrite.num_streams_open_handle = 1,
-               .overwrite.num_streams_closed_handle = 1,
-               .overwrite.streams_open_handle = {"::$DATA"},
-               .overwrite.streams_closed_handle = {"::$DATA"},
-               .eof.size = 0,
-               .eof.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .eof.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .eof.num_streams_open_handle = 1,
-               .eof.num_streams_closed_handle = 1,
-               .eof.streams_open_handle = {"::$DATA"},
-               .eof.streams_closed_handle = {"::$DATA"},
-               .doc.size = 3,
-               .doc.initial_status = NT_STATUS_DELETE_PENDING,
-               .doc.final_status = NT_STATUS_OK,
-               .doc.num_streams_open_handle = 2,
-               .doc.num_streams_closed_handle = 2,
-               .doc.streams_open_handle = {"::$DATA", AFPRESOURCE_STREAM},
-               .doc.streams_closed_handle = {"::$DATA", AFPRESOURCE_STREAM},
+               .create = {
+                       .size = 0,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
+               .write = {
+                       .size = 3,
+                       .initial_status = NT_STATUS_OK,
+                       .final_status = NT_STATUS_OK,
+                       .num_streams_open_handle = 2,
+                       .num_streams_closed_handle = 2,
+                       .streams_open_handle = {"::$DATA", AFPRESOURCE_STREAM},
+                       .streams_closed_handle = {"::$DATA", AFPRESOURCE_STREAM},
+               },
+               .overwrite = {
+                       .size = 0,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
+               .eof = {
+                       .size = 0,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
+               .doc = {
+                       .size = 3,
+                       .initial_status = NT_STATUS_DELETE_PENDING,
+                       .final_status = NT_STATUS_OK,
+                       .num_streams_open_handle = 2,
+                       .num_streams_closed_handle = 2,
+                       .streams_open_handle = {"::$DATA", AFPRESOURCE_STREAM},
+                       .streams_closed_handle = {"::$DATA", AFPRESOURCE_STREAM},
+               },
        };
 
        struct tcase tcase_foo_ro = (struct tcase) {
@@ -6106,13 +6130,15 @@ static bool test_empty_stream(struct torture_context *tctx,
                .access = SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE,
                .write_data = "foo",
                .write_size = 3,
-               .create.size = 0,
-               .create.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.num_streams_open_handle = 1,
-               .create.num_streams_closed_handle = 1,
-               .create.streams_open_handle = {"::$DATA"},
-               .create.streams_closed_handle = {"::$DATA"},
+               .create = {
+                       .size = 0,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
        };
 
        struct tcase tcase_foo_rw = (struct tcase) {
@@ -6120,41 +6146,51 @@ static bool test_empty_stream(struct torture_context *tctx,
                .access = SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE|SEC_FILE_WRITE_DATA|SEC_STD_DELETE,
                .write_data = "foo",
                .write_size = 3,
-               .create.size = 0,
-               .create.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .create.num_streams_open_handle = 1,
-               .create.num_streams_closed_handle = 1,
-               .create.streams_open_handle = {"::$DATA"},
-               .create.streams_closed_handle = {"::$DATA"},
-               .write.size = 3,
-               .write.initial_status = NT_STATUS_OK,
-               .write.final_status = NT_STATUS_OK,
-               .write.num_streams_open_handle = 2,
-               .write.num_streams_closed_handle = 2,
-               .write.streams_open_handle = {"::$DATA", ":foo:$DATA"},
-               .write.streams_closed_handle = {"::$DATA", ":foo:$DATA"},
-               .overwrite.size = 0,
-               .overwrite.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .overwrite.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .overwrite.num_streams_open_handle = 1,
-               .overwrite.num_streams_closed_handle = 1,
-               .overwrite.streams_open_handle = {"::$DATA"},
-               .overwrite.streams_closed_handle = {"::$DATA"},
-               .eof.size = 0,
-               .eof.initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .eof.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .eof.num_streams_open_handle = 1,
-               .eof.num_streams_closed_handle = 1,
-               .eof.streams_open_handle = {"::$DATA"},
-               .eof.streams_closed_handle = {"::$DATA"},
-               .doc.size = 3,
-               .doc.initial_status = NT_STATUS_DELETE_PENDING,
-               .doc.final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
-               .doc.num_streams_open_handle = 2,
-               .doc.num_streams_closed_handle = 1,
-               .doc.streams_open_handle = {"::$DATA", ":foo:$DATA"},
-               .doc.streams_closed_handle = {"::$DATA"},
+               .create = {
+                       .size = 0,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
+               .write = {
+                       .size = 3,
+                       .initial_status = NT_STATUS_OK,
+                       .final_status = NT_STATUS_OK,
+                       .num_streams_open_handle = 2,
+                       .num_streams_closed_handle = 2,
+                       .streams_open_handle = {"::$DATA", ":foo:$DATA"},
+                       .streams_closed_handle = {"::$DATA", ":foo:$DATA"},
+               },
+               .overwrite = {
+                       .size = 0,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
+               .eof = {
+                       .size = 0,
+                       .initial_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 1,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
+               .doc = {
+                       .size = 3,
+                       .initial_status = NT_STATUS_DELETE_PENDING,
+                       .final_status = NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                       .num_streams_open_handle = 2,
+                       .num_streams_closed_handle = 1,
+                       .streams_open_handle = {"::$DATA", ":foo:$DATA"},
+                       .streams_closed_handle = {"::$DATA"},
+               },
        };
 
        struct tcase tcases[] = {
Samba Shared Repository