leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdtdec: test: Use compound statement macros

Browse Source 
This eliminates the need for intermediate helper functions and allow the
macros to return a value so that it can be used subsequently.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Thierry Reding 2019-03-21 19:10:06 +01:00 committed by Simon Glass
parent 3db600c3ea
commit a95460a45b
1 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/fdtdec_test.c
View File

@ -15,48 +15,28 @@
/* The size of our test fdt blob */ /* The size of our test fdt blob */
#define FDT_SIZE (16 * 1024) #define FDT_SIZE (16 * 1024)
/** #define CHECK(op) ({ \
* Check if an operation failed, and if so, print an error int err = op; \
* if (err < 0) { \
* @param oper_name Name of operation printf("%s: %s: %s\n", __func__, #op, \
* @param err Error code to check fdt_strerror(err)); \
* return err; \
* @return 0 if ok, -1 if there was an error } \
*/ \
static int fdt_checkerr(const char *oper_name, int err) err; \
{ })
if (err) {
printf("%s: %s: %s\n", __func__, oper_name, fdt_strerror(err));
return -1;
}
return 0; #define CHECKVAL(op, expected) ({ \
} int err = op; \
if (err != expected) { \
printf("%s: %s: expected %d, but returned %d\n",\
__func__, #op, expected, err); \
return err; \
} \
\
err; \
})
/**
* Check the result of an operation and if incorrect, print an error
*
* @param oper_name Name of operation
* @param expected Expected value
* @param value Actual value
*
* @return 0 if ok, -1 if there was an error
*/
static int checkval(const char *oper_name, int expected, int value)
{
if (expected != value) {
printf("%s: %s: expected %d, but returned %d\n", __func__,
oper_name, expected, value);
return -1;
}
return 0;
}
#define CHECK(op) if (fdt_checkerr(#op, op)) return -1
#define CHECKVAL(op, expected) \
if (checkval(#op, expected, op)) \
return -1
#define CHECKOK(op) CHECKVAL(op, 0) #define CHECKOK(op) CHECKVAL(op, 0)
/* maximum number of nodes / aliases to generate */ /* maximum number of nodes / aliases to generate */
@ -138,7 +118,7 @@ static int run_test(const char *aliases, const char *nodes, const char *expect)
CHECKVAL(make_fdt(blob, FDT_SIZE, aliases, nodes), 0); CHECKVAL(make_fdt(blob, FDT_SIZE, aliases, nodes), 0);
CHECKVAL(fdtdec_find_aliases_for_id(blob, "i2c", CHECKVAL(fdtdec_find_aliases_for_id(blob, "i2c",
COMPAT_UNKNOWN, COMPAT_UNKNOWN,
list, ARRAY_SIZE(list)), strlen(expect)); list, ARRAY_SIZE(list)), (int)strlen(expect));
/* Check we got the right ones */ /* Check we got the right ones */
for (i = 0, s = expect; *s; s++, i++) { for (i = 0, s = expect; *s; s++, i++) {