From 7343528e5821c69224000ed7cfd3e8aaf47b7a93 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Fri, 16 Nov 2012 09:56:52 +0200 Subject: ubi-tests: switch to using common.h from the top level Sorry, the commit is huge, I just did not have time to split it. Signed-off-by: Artem Bityutskiy --- tests/ubi-tests/mkvol_bad.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/ubi-tests/mkvol_bad.c') diff --git a/tests/ubi-tests/mkvol_bad.c b/tests/ubi-tests/mkvol_bad.c index 2292df6..27f4795 100644 --- a/tests/ubi-tests/mkvol_bad.c +++ b/tests/ubi-tests/mkvol_bad.c @@ -25,7 +25,8 @@ #include #include #include "libubi.h" -#define TESTNAME "mkvol_bad" +#define PROGRAM_NAME "mkvol_bad" +#include "common.h" #include "helpers.h" static libubi_t libubi; @@ -41,7 +42,7 @@ static int test_mkvol(void) { int ret, i; struct ubi_mkvol_request req; - const char *name = TESTNAME ":test_mkvol()"; + const char *name = PROGRAM_NAME ":test_mkvol()"; req.alignment = 1; req.bytes = dev_info.avail_bytes; @@ -201,7 +202,7 @@ static int test_mkvol(void) if (errno == ENFILE) break; failed("ubi_mkvol"); - errmsg("vol_id %d", i); + errorm("vol_id %d", i); goto remove; } } @@ -226,7 +227,7 @@ static int test_rmvol(void) { int ret; struct ubi_mkvol_request req; - const char *name = TESTNAME ":test_rmvol()"; + const char *name = PROGRAM_NAME ":test_rmvol()"; /* Bad vol_id */ ret = ubi_rmvol(libubi, node, -1); -- cgit v1.2.3