chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: make test output a bit nicer
[elogind.git]
/
src
/
journal
/
test-catalog.c
diff --git
a/src/journal/test-catalog.c
b/src/journal/test-catalog.c
index 863b9f4b51b48bc11e214d127ebe1bcdc336c464..ffe180265bf476c4405c47f43eaabf067c6377e1 100644
(file)
--- a/
src/journal/test-catalog.c
+++ b/
src/journal/test-catalog.c
@@
-121,7
+121,7
@@
static void test_catalog_update(void) {
}
static void test_catalog_file_lang(void) {
}
static void test_catalog_file_lang(void) {
- _cleanup_free_ char *lang = NULL, *lang2 = NULL, *lang3 = NULL;
+ _cleanup_free_ char *lang = NULL, *lang2 = NULL, *lang3 = NULL
, *lang4 = NULL
;
assert_se(catalog_file_lang("systemd.de_DE.catalog", &lang) == 1);
assert_se(streq(lang, "de_DE"));
assert_se(catalog_file_lang("systemd.de_DE.catalog", &lang) == 1);
assert_se(streq(lang, "de_DE"));
@@
-140,6
+140,12
@@
static void test_catalog_file_lang(void) {
assert_se(catalog_file_lang("systemd.0123456789012345678901234567890.catalog", &lang3) == 1);
assert_se(streq(lang3, "0123456789012345678901234567890"));
assert_se(catalog_file_lang("systemd.0123456789012345678901234567890.catalog", &lang3) == 1);
assert_se(streq(lang3, "0123456789012345678901234567890"));
+
+ assert_se(catalog_file_lang("/x/y/systemd.catalog", &lang4) == 0);
+ assert_se(lang4 == NULL);
+
+ assert_se(catalog_file_lang("/x/y/systemd.ru_RU.catalog", &lang4) == 1);
+ assert_se(streq(lang4, "ru_RU"));
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
@@
-150,6
+156,8
@@
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_set_max_level(LOG_DEBUG);
+ test_catalog_file_lang();
+
test_catalog_importing();
test_catalog_update();
test_catalog_importing();
test_catalog_update();
@@
-166,7
+174,5
@@
int main(int argc, char *argv[]) {
if (database)
unlink(database);
if (database)
unlink(database);
- test_catalog_file_lang();
-
return 0;
}
return 0;
}