chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move DEFINE_TRIVIAL_CLEANUP_FUNC to macro.h
[elogind.git]
/
src
/
journal
/
test-catalog.c
diff --git
a/src/journal/test-catalog.c
b/src/journal/test-catalog.c
index 863b9f4b51b48bc11e214d127ebe1bcdc336c464..c605ee0e70963f5c7400cd3622a067310827a545 100644
(file)
--- a/
src/journal/test-catalog.c
+++ b/
src/journal/test-catalog.c
@@
-24,6
+24,7
@@
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
+#include <fcntl.h>
#include "util.h"
#include "log.h"
#include "util.h"
#include "log.h"
@@
-45,12
+46,14
@@
static void test_import(Hashmap *h, struct strbuf *sb,
const char* contents, ssize_t size, int code) {
int r;
char name[] = "/tmp/test-catalog.XXXXXX";
const char* contents, ssize_t size, int code) {
int r;
char name[] = "/tmp/test-catalog.XXXXXX";
- _cleanup_close_ int fd = mkstemp(name);
- assert(fd >= 0);
+ _cleanup_close_ int fd;
+
+ fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+ assert_se(fd >= 0);
assert_se(write(fd, contents, size) == size);
r = catalog_import_file(h, sb, name);
assert_se(write(fd, contents, size) == size);
r = catalog_import_file(h, sb, name);
- assert(r == code);
+ assert
_se
(r == code);
unlink(name);
}
unlink(name);
}
@@
-59,13
+62,13
@@
static void test_catalog_importing(void) {
Hashmap *h;
struct strbuf *sb;
Hashmap *h;
struct strbuf *sb;
- assert_se(h = hashmap_new(
catalog_hash_func, catalog_compare_func
));
+ assert_se(h = hashmap_new(
&catalog_hash_ops
));
assert_se(sb = strbuf_new());
#define BUF "xxx"
test_import(h, sb, BUF, sizeof(BUF), -EINVAL);
#undef BUF
assert_se(sb = strbuf_new());
#define BUF "xxx"
test_import(h, sb, BUF, sizeof(BUF), -EINVAL);
#undef BUF
- assert(hashmap_isempty(h));
+ assert
_se
(hashmap_isempty(h));
log_debug("----------------------------------------");
#define BUF \
log_debug("----------------------------------------");
#define BUF \
@@
-86,7
+89,7
@@
static void test_catalog_importing(void) {
test_import(h, sb, BUF, sizeof(BUF), 0);
#undef BUF
test_import(h, sb, BUF, sizeof(BUF), 0);
#undef BUF
- assert(hashmap_size(h) == 1);
+ assert
_se
(hashmap_size(h) == 1);
log_debug("----------------------------------------");
log_debug("----------------------------------------");
@@
-98,30
+101,30
@@
static void test_catalog_importing(void) {
static const char* database = NULL;
static void test_catalog_update(void) {
static const char* database = NULL;
static void test_catalog_update(void) {
+ static char name[] = "/tmp/test-catalog.XXXXXX";
int r;
int r;
- static char name[] = "/tmp/test-catalog.XXXXXX";
- r = mkstemp(name);
- assert(r >= 0);
+ r = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+ assert_se(r >= 0);
database = name;
/* Test what happens if there are no files. */
r = catalog_update(database, NULL, NULL);
database = name;
/* Test what happens if there are no files. */
r = catalog_update(database, NULL, NULL);
- assert(r >= 0);
+ assert
_se
(r >= 0);
/* Test what happens if there are no files in the directory. */
r = catalog_update(database, NULL, no_catalog_dirs);
/* Test what happens if there are no files in the directory. */
r = catalog_update(database, NULL, no_catalog_dirs);
- assert(r >= 0);
+ assert
_se
(r >= 0);
/* Make sure that we at least have some files loaded or the
catalog_list below will fail. */
r = catalog_update(database, NULL, catalog_dirs);
/* Make sure that we at least have some files loaded or the
catalog_list below will fail. */
r = catalog_update(database, NULL, catalog_dirs);
- assert(r >= 0);
+ assert
_se
(r >= 0);
}
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
+143,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[]) {
@@
-148,7
+157,10
@@
int main(int argc, char *argv[]) {
setlocale(LC_ALL, "de_DE.UTF-8");
setlocale(LC_ALL, "de_DE.UTF-8");
- log_set_max_level(LOG_DEBUG);
+ log_parse_environment();
+ log_open();
+
+ test_catalog_file_lang();
test_catalog_importing();
test_catalog_importing();
@@
-166,7
+178,5
@@
int main(int argc, char *argv[]) {
if (database)
unlink(database);
if (database)
unlink(database);
- test_catalog_file_lang();
-
return 0;
}
return 0;
}