From: Janosch Frank <frankja@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, imbrenda@linux.ibm.com,
david@redhat.com, thuth@redhat.com, cohuck@redhat.com
Subject: [kvm-unit-tests PATCH] s390x: selftest: Fix report output
Date: Mon, 31 May 2021 10:50:03 +0000 [thread overview]
Message-ID: <20210531105003.44737-1-frankja@linux.ibm.com> (raw)
To make our TAP parser (and me) happy we don't want to have to reports
with exactly the same wording.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
s390x/selftest.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/s390x/selftest.c b/s390x/selftest.c
index b2fe2e7b..c2ca9896 100644
--- a/s390x/selftest.c
+++ b/s390x/selftest.c
@@ -47,12 +47,19 @@ static void test_malloc(void)
*tmp2 = 123456789;
mb();
- report((uintptr_t)tmp & 0xf000000000000000ul, "malloc: got vaddr");
- report(*tmp == 123456789, "malloc: access works");
+ report_prefix_push("malloc");
+ report_prefix_push("ptr_0");
+ report((uintptr_t)tmp & 0xf000000000000000ul, "allocated memory");
+ report(*tmp == 123456789, "wrote allocated memory");
+ report_prefix_pop();
+
+ report_prefix_push("ptr_1");
report((uintptr_t)tmp2 & 0xf000000000000000ul,
- "malloc: got 2nd vaddr");
- report((*tmp2 == 123456789), "malloc: access works");
- report(tmp != tmp2, "malloc: addresses differ");
+ "allocated memory");
+ report((*tmp2 == 123456789), "wrote allocated memory");
+ report_prefix_pop();
+
+ report(tmp != tmp2, "allocated memory addresses differ");
expect_pgm_int();
configure_dat(0);
@@ -62,6 +69,7 @@ static void test_malloc(void)
free(tmp);
free(tmp2);
+ report_prefix_pop();
}
int main(int argc, char**argv)
--
2.30.2
next reply other threads:[~2021-05-31 10:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 10:50 Janosch Frank [this message]
2021-05-31 10:56 ` [kvm-unit-tests PATCH] s390x: selftest: Fix report output Claudio Imbrenda
2021-05-31 11:11 ` Cornelia Huck
2021-05-31 12:09 ` Janosch Frank
2021-05-31 11:15 ` David Hildenbrand
2021-05-31 12:07 ` Janosch Frank
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210531105003.44737-1-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox