aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-02-08 18:35:41 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-02-09 16:51:05 +0000
commite5c5cd54788076973f08f6aadf0d2b2f954a0423 (patch)
treee8af28ce95bf2ffee4f8f00ec08b253f45b82d84 /tests
parentconfig: rename enum config_key_binding_type -> key_binding_type (diff)
config: ‘pipe’ is now optional ‘aux’ data in the key-binding struct
This allows us to add helper functions that e.g. compare bindings’ aux data in a generic way.
Diffstat (limited to 'tests')
-rw-r--r--tests/test-config.c40
1 files changed, 21 insertions, 19 deletions
diff --git a/tests/test-config.c b/tests/test-config.c
index 88f22a4a..be18a593 100644
--- a/tests/test-config.c
+++ b/tests/test-config.c
@@ -756,30 +756,30 @@ test_key_binding(struct context *ctx, bool (*parse_fun)(struct context *ctx),
&bindings->arr[bindings->count - 1];
if (argv) {
- if (binding->pipe.argv.args == NULL) {
+ if (binding->aux.pipe.args == NULL) {
BUG("[%s].%s=%s: pipe argv is NULL",
ctx->section, ctx->key, ctx->value);
}
for (size_t i = 0; i < ALEN(args); i++) {
- if (binding->pipe.argv.args[i] == NULL ||
- strcmp(binding->pipe.argv.args[i], args[i]) != 0)
+ if (binding->aux.pipe.args[i] == NULL ||
+ strcmp(binding->aux.pipe.args[i], args[i]) != 0)
{
BUG("[%s].%s=%s: pipe argv not the expected one: "
"mismatch of arg #%zu: expected=\"%s\", got=\"%s\"",
ctx->section, ctx->key, ctx->value, i,
- args[i], binding->pipe.argv.args[i]);
+ args[i], binding->aux.pipe.args[i]);
}
}
- if (binding->pipe.argv.args[ALEN(args)] != NULL) {
+ if (binding->aux.pipe.args[ALEN(args)] != NULL) {
BUG("[%s].%s=%s: pipe argv not the expected one: "
"expected NULL terminator at arg #%zu, got=\"%s\"",
ctx->section, ctx->key, ctx->value,
- ALEN(args), binding->pipe.argv.args[ALEN(args)]);
+ ALEN(args), binding->aux.pipe.args[ALEN(args)]);
}
} else {
- if (binding->pipe.argv.args != NULL) {
+ if (binding->aux.pipe.args != NULL) {
BUG("[%s].%s=%s: pipe argv not NULL",
ctx->section, ctx->key, ctx->value);
}
@@ -889,21 +889,23 @@ _test_binding_collisions(struct context *ctx,
case FAIL_DIFFERENT_ARGV:
case SUCCED_SAME_ACTION_AND_ARGV:
- bindings.arr[0].pipe.master_copy = true;
- bindings.arr[0].pipe.argv.args = xcalloc(
- 4, sizeof(bindings.arr[0].pipe.argv.args[0]));
- bindings.arr[0].pipe.argv.args[0] = xstrdup("/usr/bin/foobar");
- bindings.arr[0].pipe.argv.args[1] = xstrdup("hello");
- bindings.arr[0].pipe.argv.args[2] = xstrdup("world");
+ bindings.arr[0].aux.type = BINDING_AUX_PIPE;
+ bindings.arr[0].aux.master_copy = true;
+ bindings.arr[0].aux.pipe.args = xcalloc(
+ 4, sizeof(bindings.arr[0].aux.pipe.args[0]));
+ bindings.arr[0].aux.pipe.args[0] = xstrdup("/usr/bin/foobar");
+ bindings.arr[0].aux.pipe.args[1] = xstrdup("hello");
+ bindings.arr[0].aux.pipe.args[2] = xstrdup("world");
- bindings.arr[1].pipe.master_copy = true;
- bindings.arr[1].pipe.argv.args = xcalloc(
- 4, sizeof(bindings.arr[1].pipe.argv.args[0]));
- bindings.arr[1].pipe.argv.args[0] = xstrdup("/usr/bin/foobar");
- bindings.arr[1].pipe.argv.args[1] = xstrdup("hello");
+ bindings.arr[1].aux.type = BINDING_AUX_PIPE;
+ bindings.arr[1].aux.master_copy = true;
+ bindings.arr[1].aux.pipe.args = xcalloc(
+ 4, sizeof(bindings.arr[1].aux.pipe.args[0]));
+ bindings.arr[1].aux.pipe.args[0] = xstrdup("/usr/bin/foobar");
+ bindings.arr[1].aux.pipe.args[1] = xstrdup("hello");
if (test_mode == SUCCED_SAME_ACTION_AND_ARGV)
- bindings.arr[1].pipe.argv.args[2] = xstrdup("world");
+ bindings.arr[1].aux.pipe.args[2] = xstrdup("world");
break;
}