index 465bb08ca079004604ddc08d694d0192d509043c..f95598e27dcf222be6ef0dfe42f80e3e9f137d7c 100644 (file)
{
/* host */ NULL, NULL,
/* svc */ NULL, NULL,
{
/* host */ NULL, NULL,
/* svc */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, NULL, NULL, 1
},
{
/* host */ "a", NULL,
/* svc */ NULL, NULL,
},
{
/* host */ "a", NULL,
/* svc */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, NULL, NULL, 1
},
{
/* host */ "b", NULL,
/* svc */ NULL, NULL,
},
{
/* host */ "b", NULL,
/* svc */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ NULL, "^a$",
/* svc */ NULL, NULL,
},
{
/* host */ NULL, "^a$",
/* svc */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, NULL, NULL, 1
},
{
/* host */ NULL, "^b$",
/* svc */ NULL, NULL,
},
{
/* host */ NULL, "^b$",
/* svc */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ "a", "^a$",
/* svc */ NULL, NULL,
},
{
/* host */ "a", "^a$",
/* svc */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, NULL, NULL, 1
},
{
/* host */ "a", "^b$",
/* svc */ NULL, NULL,
},
{
/* host */ "a", "^b$",
/* svc */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ "b", "^a$",
/* svc */ NULL, NULL,
},
{
/* host */ "b", "^a$",
/* svc */ NULL, NULL,
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ "a", "^a$",
/* svc */ "s1", NULL,
},
{
/* host */ "a", "^a$",
/* svc */ "s1", NULL,
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, NULL, NULL, 1
},
{
/* host */ "a", "^a$",
/* svc */ NULL, "^s1$",
},
{
/* host */ "a", "^a$",
/* svc */ NULL, "^s1$",
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, NULL, NULL, 1
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
- /* attr */ NULL, NULL, NULL, NULL, 0
+ /* attr */ NULL, NULL, NULL, NULL, 1
},
{
/* host */ "a", "^a$",
/* svc */ "x1", NULL,
},
{
/* host */ "a", "^a$",
/* svc */ "x1", NULL,
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ "a", "^a$",
/* svc */ NULL, "x",
},
{
/* host */ "a", "^a$",
/* svc */ NULL, "x",
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ "a", "^a$",
/* svc */ "x1", "x",
},
{
/* host */ "a", "^a$",
/* svc */ "x1", "x",
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "x",
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "x",
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ "a", "^a$",
/* svc */ "x1", "s",
},
{
/* host */ "a", "^a$",
/* svc */ "x1", "s",
- /* attr */ NULL, NULL, NULL, NULL, -1
+ /* attr */ NULL, NULL, NULL, NULL, 0
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
- /* attr */ "k1", NULL, NULL, NULL, 0
+ /* attr */ "k1", NULL, NULL, NULL, 1
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
- /* attr */ NULL, "^k", NULL, NULL, 0
+ /* attr */ NULL, "^k", NULL, NULL, 1
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
- /* attr */ NULL, NULL, "v1", NULL, 0
+ /* attr */ NULL, NULL, "v1", NULL, 1
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
- /* attr */ NULL, NULL, NULL, "^v1$", 0
+ /* attr */ NULL, NULL, NULL, "^v1$", 1
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
},
{
/* host */ "a", "^a$",
/* svc */ "s1", "^s1$",
- /* attr */ "k1", "1", "v1", "1", 0
+ /* attr */ "k1", "1", "v1", "1", 1
},
};
},
};
sdb_store_matcher_t *right;
int expected;
} golden_data[] = {
sdb_store_matcher_t *right;
int expected;
} golden_data[] = {
- { "OR", always, always, 0 },
- { "OR", always, never, 0 },
- { "OR", never, always, 0 },
- { "OR", never, never, -1 },
- { "AND", always, always, 0 },
- { "AND", always, never, -1 },
- { "AND", never, always, -1 },
- { "AND", never, never, -1 },
+ { "OR", always, always, 1 },
+ { "OR", always, never, 1 },
+ { "OR", never, always, 1 },
+ { "OR", never, never, 0 },
+ { "AND", always, always, 1 },
+ { "AND", always, never, 0 },
+ { "AND", never, always, 0 },
+ { "AND", never, never, 0 },
};
int status;
};
int status;
obj = sdb_store_get_host("a");
status = sdb_store_matcher_matches(always, obj);
obj = sdb_store_get_host("a");
status = sdb_store_matcher_matches(always, obj);
- fail_unless(status == 0,
+ fail_unless(status == 1,
"INTERNAL ERROR: 'always' did not match host");
status = sdb_store_matcher_matches(never, obj);
"INTERNAL ERROR: 'always' did not match host");
status = sdb_store_matcher_matches(never, obj);
- fail_unless(status < 0,
+ fail_unless(status == 0,
"INTERNAL ERROR: 'never' matches host");
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {
"INTERNAL ERROR: 'never' matches host");
for (i = 0; i < SDB_STATIC_ARRAY_LEN(golden_data); ++i) {