X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-catalog.c;h=ffe180265bf476c4405c47f43eaabf067c6377e1;hb=9130f2128b64de19a3b7d6db7e0d371adfd296c2;hp=863b9f4b51b48bc11e214d127ebe1bcdc336c464;hpb=c7332b0844e28d9b70c3c763b929f105c1056fe8;p=elogind.git diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c index 863b9f4b5..ffe180265 100644 --- 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) { - _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")); @@ -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("/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[]) { @@ -150,6 +156,8 @@ int main(int argc, char *argv[]) { log_set_max_level(LOG_DEBUG); + test_catalog_file_lang(); + test_catalog_importing(); test_catalog_update(); @@ -166,7 +174,5 @@ int main(int argc, char *argv[]) { if (database) unlink(database); - test_catalog_file_lang(); - return 0; }