mirror of
https://github.com/samba-team/samba.git
synced 2025-02-10 13:57:47 +03:00
s4:torture: Use C99 initializers for dirs in smb2 notify test
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
parent
8647ae63d7
commit
2df8e808d6
@ -1840,46 +1840,126 @@ static bool torture_smb2_notify_tree(struct torture_context *torture,
|
||||
struct smb2_handle h1;
|
||||
int counted;
|
||||
} dirs[] = {
|
||||
{BASEDIR_TREE "\\abc",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 30 },
|
||||
{BASEDIR_TREE "\\zqy",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 8 },
|
||||
{BASEDIR_TREE "\\atsy",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 4 },
|
||||
{BASEDIR_TREE "\\abc\\foo",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 2 },
|
||||
{BASEDIR_TREE "\\abc\\blah",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 13 },
|
||||
{BASEDIR_TREE "\\abc\\blah",
|
||||
false, FILE_NOTIFY_CHANGE_NAME, 7 },
|
||||
{BASEDIR_TREE "\\abc\\blah\\a",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 2 },
|
||||
{BASEDIR_TREE "\\abc\\blah\\b",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 2 },
|
||||
{BASEDIR_TREE "\\abc\\blah\\c",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 2 },
|
||||
{BASEDIR_TREE "\\abc\\fooblah",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 2 },
|
||||
{BASEDIR_TREE "\\zqy\\xx",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 2 },
|
||||
{BASEDIR_TREE "\\zqy\\yyy",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 2 },
|
||||
{BASEDIR_TREE "\\zqy\\..",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 40 },
|
||||
{BASEDIR_TREE,
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 40 },
|
||||
{BASEDIR_TREE,
|
||||
false,FILE_NOTIFY_CHANGE_NAME, 6 },
|
||||
{BASEDIR_TREE "\\atsy",
|
||||
false,FILE_NOTIFY_CHANGE_NAME, 4 },
|
||||
{BASEDIR_TREE "\\abc",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 24 },
|
||||
{BASEDIR_TREE "\\abc",
|
||||
false,FILE_NOTIFY_CHANGE_FILE_NAME, 0 },
|
||||
{BASEDIR_TREE "\\abc",
|
||||
true, FILE_NOTIFY_CHANGE_FILE_NAME, 0 },
|
||||
{BASEDIR_TREE "\\abc",
|
||||
true, FILE_NOTIFY_CHANGE_NAME, 24 },
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 30,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\zqy",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 8,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\atsy",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 4,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc\\foo",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 2,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc\\blah",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 13,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc\\blah",
|
||||
.recursive = false,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 7,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc\\blah\\a",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 2,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc\\blah\\b",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 2,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc\\blah\\c",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 2,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc\\fooblah",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 2,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\zqy\\xx",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 2,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\zqy\\yyy",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 2,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\zqy\\..",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 40,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE,
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 40,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE,
|
||||
.recursive = false,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 6,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\atsy",
|
||||
.recursive = false,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 4,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 24,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc",
|
||||
.recursive = false,
|
||||
.filter = FILE_NOTIFY_CHANGE_FILE_NAME,
|
||||
.expected = 0,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_FILE_NAME,
|
||||
.expected = 0,
|
||||
},
|
||||
{
|
||||
.path = BASEDIR_TREE "\\abc",
|
||||
.recursive = true,
|
||||
.filter = FILE_NOTIFY_CHANGE_NAME,
|
||||
.expected = 24,
|
||||
},
|
||||
};
|
||||
int i;
|
||||
NTSTATUS status;
|
||||
|
Loading…
x
Reference in New Issue
Block a user