diff options
| author | Djalal Harouni <tixxdz@opendz.org> | 2014-08-18 11:59:59 +0100 |
|---|---|---|
| committer | Daniel Mack <zonque@gmail.com> | 2014-08-19 09:16:48 +0200 |
| commit | 8b742a708c7fd597fdcf18e67078cf2f2da3b42e (patch) | |
| tree | ff90f47fddc3fbf95885373e4264e573fa8ac611 | |
| parent | 52f8384912ac5a3d79e2599be3de4914483aa9f6 (diff) | |
| download | kdbus-bus-8b742a708c7fd597fdcf18e67078cf2f2da3b42e.tar.gz kdbus-bus-8b742a708c7fd597fdcf18e67078cf2f2da3b42e.tar.bz2 kdbus-bus-8b742a708c7fd597fdcf18e67078cf2f2da3b42e.zip | |
test: move shared definitions to kdbus-util.h to use them in other tests
Signed-off-by: Djalal Harouni <tixxdz@opendz.org>
| -rw-r--r-- | test/kdbus-util.h | 12 | ||||
| -rw-r--r-- | test/test-kdbus.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/test/kdbus-util.h b/test/kdbus-util.h index 765f6af683c..342ea9bc1a5 100644 --- a/test/kdbus-util.h +++ b/test/kdbus-util.h @@ -29,6 +29,18 @@ (uint8_t *)(item) < (uint8_t *)(head) + (head)->size; \ item = KDBUS_ITEM_NEXT(item)) +enum { + CHECK_OK, + CHECK_SKIP, + CHECK_ERR, +}; + +#define ASSERT_RETURN(cond) \ + if (!(cond)) { \ + fprintf(stderr, "Assertion '%s' failed in %s(), line %d\n", #cond, __func__, __LINE__); \ + return CHECK_ERR; \ + } + /* Dump as user of process, useful for user namespace testing */ #define SUID_DUMP_USER 1 diff --git a/test/test-kdbus.c b/test/test-kdbus.c index 2db7eb81a4f..482dd5b82aa 100644 --- a/test/test-kdbus.c +++ b/test/test-kdbus.c @@ -19,12 +19,6 @@ #include "kdbus-enum.h" enum { - CHECK_OK, - CHECK_SKIP, - CHECK_ERR, -}; - -enum { CHECK_CREATE_BUS = 1 << 0, CHECK_CREATE_CONN = 1 << 1, }; @@ -61,12 +55,6 @@ struct kdbus_check { KDBUS_ATTACH_SECLABEL | \ KDBUS_ATTACH_AUDIT -#define ASSERT_RETURN(cond) \ - if (!(cond)) { \ - fprintf(stderr, "Assertion '%s' failed in %s(), line %d\n", #cond, __func__, __LINE__); \ - return CHECK_ERR; \ - } - static struct kdbus_conn *make_conn(const char *buspath, uint64_t flags) { int ret; |