diff options
| author | Ran Benita <ran234@gmail.com> | 2012-08-29 12:10:28 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2012-09-03 10:31:12 +0300 |
| commit | 7f04ffc4d331868c66bf8abee5fc27fe61bad079 (patch) | |
| tree | b25fda66f809fb002bf7e063eca081cc51bb44d3 /test/rules-file.c | |
| parent | 41472822b68bd71b2b1ac5c2cf57f28b727ef744 (diff) | |
| download | xorg-lib-libxkbcommon-7f04ffc4d331868c66bf8abee5fc27fe61bad079.tar.gz | |
rules: fix check for appending '|' character when applying
There are two ways to separate multiple files in XKB include statements:
'+' will cause the later file to override the first in case of conflict,
while '|' will cause it augment it (this is done by xkbcomp). '!' is
unrelated here.
Since '|' is practically never used, this wasn't noticed.
In the modified test, the '|some_compat' previously was just ignored.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'test/rules-file.c')
| -rw-r--r-- | test/rules-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/rules-file.c b/test/rules-file.c index ee53f09..67a000e 100644 --- a/test/rules-file.c +++ b/test/rules-file.c @@ -110,7 +110,7 @@ main(void) .options = "my_option", .keycodes = "my_keycodes", .types = "my_types", - .compat = "my_compat+some:compat", + .compat = "my_compat|some:compat", .symbols = "my_symbols+extra_variant", }; assert(test_rules(ctx, &test1)); |