Promote tools/compose to xkbcli-compile-compose #402
Conversation
wismill
added
enhancement
based on the filename |
wismill
force-pushed
the
compose/xkbcli
branch
from
865374d to
881d2ef
Compare
|
I realized I did not push my changes…
@whot I would prefer to keep |
test/compose.c
Outdated
| } | ||
| assert(buf[c] == '\0'); | ||
| assert(strlen(buf) == c); | ||
| assert(is_valid_utf8(buf, c)); |
There was a problem hiding this comment.
unrelated to this series: we should have something like
#define assert_printf(cond, ...) \
if (!(cond)) { \
printf("Assertion failure: __VA_ARGS__); \
assert(cond); \
}to aid with debugging assertion failures.
There was a problem hiding this comment.
I introduced assert_printf as you suggested, as well as assert_streq_not_null. I use them only for the new tests.
wismill
force-pushed
the
compose/xkbcli
branch
from
881d2ef to
c56b95e
Compare
test/compose.c
Outdated
| } | ||
| assert(buf[c] == '\0'); | ||
| assert(strlen(buf) == c); | ||
| assert(is_valid_utf8(buf, c)); |
There was a problem hiding this comment.
I introduced assert_printf as you suggested, as well as assert_streq_not_null. I use them only for the new tests.
Previously this tool was only used for internal testing and thus not installed. But it is useful for debugging, much like xkbcli-compile-keymap.
`compgen` expect command options list formatted as a newline-separated list. Add a missing newline when concatenating two lists.
Currently the result string is not escaped and may produce invalid results. Fixed by introducing an ad-hoc escape function and relative tests.
wismill
force-pushed
the
compose/xkbcli
branch
from
c56b95e to
c516335
Compare
Current options to set the locale are convoluted: - An explicit locale *must* be given, while a sane default would be to use the user environment. - Then there are two options that were useful while testing locale handling: read environment variables or use `setlocale`. But the program has already called: ``` setlocale(LC_ALL, ""); ``` so it turns out the two options lead to the same results. Remove options `--locale-from-env` and `--locale-from-setlocale` and make the locale default to the user environment.
wismill
force-pushed
the
compose/xkbcli
branch
from
c516335 to
c15df4b
Compare
Fixes #381