Skip to contentSkip to conversation

s390x: selftest: Fix report output

PATCH In review Janosch Frank 4 participants 6 messages May 31, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390x: selftest: Fix report output

To make our TAP parser (and me) happy we don't want to have to reports with exactly the same wording.

---
 s390x/selftest.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
s390x/selftest.c +13 -5
index b2fe2e7b..c2ca9896 100644
@@ -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)
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · On Mon, 31 May 2021 10:50:03 +0000 Janosch Frank <[email protected]> wrote:

To make our TAP parser (and me) happy we don't want to have to reports with exactly the same wording.

Quoted 43 lines
---
 s390x/selftest.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
s390x/selftest.c +12 -5
index b2fe2e7b..c2ca9896 100644
@@ -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");
 
s390x/selftest.c +1 -0
 	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 lore raw
In reply to Janosch Frank
Quoted 1 line · On Mon, 31 May 2021 10:50:03 +0000 Janosch Frank <[email protected]> wrote:

To make our TAP parser (and me) happy we don't want to have to reports

"we want to have two reports" ?

If that's not what has been intended, I'm confused :)

Quoted 44 lines

with exactly the same wording.

---
 s390x/selftest.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
s390x/selftest.c +13 -5
index b2fe2e7b..c2ca9896 100644
@@ -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)
#3 lore raw
Quoted 8 lines · Cornelia Huck
Quoted 1 line · On Mon, 31 May 2021 10:50:03 +0000 Janosch Frank <[email protected]> wrote:

To make our TAP parser (and me) happy we don't want to have to reports

"we want to have two reports" ?

If that's not what has been intended, I'm confused :)

Things that happen if the following sentence is heard:
"Can you fix this quickly, please?"

Will fix, thanks for the review!

Quoted 46 lines
Quoted 45 lines

with exactly the same wording.

---
 s390x/selftest.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
s390x/selftest.c +13 -5
index b2fe2e7b..c2ca9896 100644
@@ -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)
#4 lore raw
In reply to Janosch Frank
Quoted 13 lines · Janosch Frank

To make our TAP parser (and me) happy we don't want to have to reports with exactly the same wording.

---
  s390x/selftest.c | 18 +++++++++++++-----
  1 file changed, 13 insertions(+), 5 deletions(-)
s390x/selftest.c +0 -0
index b2fe2e7b..c2ca9896 100644

s390x/selftest.c static void test_malloc(void) · line 51

Quoted 7 lines
s390x/selftest.c +2 -2
@@ -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");

instead of this "ptr_0" vs. "ptr_1" I'd just use

"allocated 1st page"
"wrote to 1st page"
"allocated 2nd page"
"wrote to 2nd page"
"1st and 2nd page differ"

Avoids one hierarchy of prefix_push ...

Quoted 26 lines
s390x/selftest.c +11 -3
+	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)
Signature · 3 lines
Thanks,

David / dhildenb
#5 lore raw
Quoted 24 lines · David Hildenbrand
Quoted 13 lines · Janosch Frank

To make our TAP parser (and me) happy we don't want to have to reports with exactly the same wording.

---
  s390x/selftest.c | 18 +++++++++++++-----
  1 file changed, 13 insertions(+), 5 deletions(-)
s390x/selftest.c +0 -0
index b2fe2e7b..c2ca9896 100644

s390x/selftest.c static void test_malloc(void) · line 51

Quoted 7 lines
s390x/selftest.c +2 -2
@@ -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");

instead of this "ptr_0" vs. "ptr_1" I'd just use

Quoted 7 lines

"allocated 1st page"
"wrote to 1st page"
"allocated 2nd page"
"wrote to 2nd page"
"1st and 2nd page differ"

Avoids one hierarchy of prefix_push ...

I'd like to keep them since I'll also move the allocation and writes into a prefix section for the v2 which will provide me with better error reports if we trigger asserts.

Also from the allocation alone these could be on the same page since we allocate ints.

Quoted 29 lines
Quoted 27 lines
s390x/selftest.c +11 -3
+	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)