summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2016-09-13 16:15:02 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-09-24 16:22:34 -0700
commitd0e3d7e1fab83606acc08036290f989c55068ee7 (patch)
tree2acf561cac6cb48f4507383955e1b8c33581f253
parent42b74d2677786cf9e135873b574428bdd74bd3fb (diff)
downloadvboot-stabilize-8838.B.tar.gz
test: Print either 'comment' or 'desc'stabilize-8838.B
Currently, test macros print out 'desc' regardless 'comment' is specified or not. This patch makes 'desc' printed out only if 'comment' is not supplied. BUG=none BRANCH=none TEST=make runtests Change-Id: I146d681b0d3cb7d41c7f80b71c59418a0250fc17 Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/385159 Commit-Ready: Randall Spangler <rspangler@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--tests/test_common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test_common.c b/tests/test_common.c
index e6c32f6b..dae485f9 100644
--- a/tests/test_common.c
+++ b/tests/test_common.c
@@ -134,11 +134,11 @@ int test_succ(int result,
const char *preamble, const char *desc, const char *comment)
{
if (result == 0) {
- fprintf(stderr, "%s: %s, %s ... " COL_GREEN "PASSED\n" COL_STOP,
- preamble, desc, comment);
+ fprintf(stderr, "%s: %s ... " COL_GREEN "PASSED\n" COL_STOP,
+ preamble, comment ? comment : desc);
} else {
- fprintf(stderr, "%s: %s, %s ... " COL_RED "FAILED\n" COL_STOP,
- preamble, desc, comment);
+ fprintf(stderr, "%s: %s ... " COL_RED "FAILED\n" COL_STOP,
+ preamble, comment ? comment : desc);
fprintf(stderr, " Expected SUCCESS, got: 0x%x (%d)\n", result, result);
gTestSuccess = 0;
}