| Message ID | 20191023084017.13142-1-frankja@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [kvm-unit-tests] s390x: Fix selftest malloc check | expand |
On 23.10.19 10:40, Janosch Frank wrote: > Commit c09c54c ("lib: use an argument which doesn't require default > argument promotion") broke the selftest. Let's fix it by converting > the binary operations to bool. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > s390x/selftest.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/s390x/selftest.c b/s390x/selftest.c > index f4acdc4..9cd6943 100644 > --- a/s390x/selftest.c > +++ b/s390x/selftest.c > @@ -49,9 +49,9 @@ static void test_malloc(void) > *tmp2 = 123456789; > mb(); > > - report("malloc: got vaddr", (uintptr_t)tmp & 0xf000000000000000ul); > + report("malloc: got vaddr", !!((uintptr_t)tmp & 0xf000000000000000ul)); > report("malloc: access works", *tmp == 123456789); > - report("malloc: got 2nd vaddr", (uintptr_t)tmp2 & 0xf000000000000000ul); > + report("malloc: got 2nd vaddr", !!((uintptr_t)tmp2 & 0xf000000000000000ul)); > report("malloc: access works", (*tmp2 == 123456789)); > report("malloc: addresses differ", tmp != tmp2); > > See https://lore.kernel.org/kvm/CAGG=3QUdVBg5JArMaBcRbBLrHqLLCpAcrtvgT4q1h0V7SHbbEQ@mail.gmail.com/T/
On 10/23/19 10:41 AM, David Hildenbrand wrote: > On 23.10.19 10:40, Janosch Frank wrote: >> Commit c09c54c ("lib: use an argument which doesn't require default >> argument promotion") broke the selftest. Let's fix it by converting >> the binary operations to bool. >> >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >> --- >> s390x/selftest.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/s390x/selftest.c b/s390x/selftest.c >> index f4acdc4..9cd6943 100644 >> --- a/s390x/selftest.c >> +++ b/s390x/selftest.c >> @@ -49,9 +49,9 @@ static void test_malloc(void) >> *tmp2 = 123456789; >> mb(); >> >> - report("malloc: got vaddr", (uintptr_t)tmp & 0xf000000000000000ul); >> + report("malloc: got vaddr", !!((uintptr_t)tmp & 0xf000000000000000ul)); >> report("malloc: access works", *tmp == 123456789); >> - report("malloc: got 2nd vaddr", (uintptr_t)tmp2 & 0xf000000000000000ul); >> + report("malloc: got 2nd vaddr", !!((uintptr_t)tmp2 & 0xf000000000000000ul)); >> report("malloc: access works", (*tmp2 == 123456789)); >> report("malloc: addresses differ", tmp != tmp2); >> >> > > See > > https://lore.kernel.org/kvm/CAGG=3QUdVBg5JArMaBcRbBLrHqLLCpAcrtvgT4q1h0V7SHbbEQ@mail.gmail.com/T/ > I completely missed that patch and only looked for fixpatches on the list -_- If possible CC me if something like this turns up, so I don't have the CI flashing red lights at me unexpectedly :)
On 23.10.19 10:45, Janosch Frank wrote: > On 10/23/19 10:41 AM, David Hildenbrand wrote: >> On 23.10.19 10:40, Janosch Frank wrote: >>> Commit c09c54c ("lib: use an argument which doesn't require default >>> argument promotion") broke the selftest. Let's fix it by converting >>> the binary operations to bool. >>> >>> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >>> --- >>> s390x/selftest.c | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/s390x/selftest.c b/s390x/selftest.c >>> index f4acdc4..9cd6943 100644 >>> --- a/s390x/selftest.c >>> +++ b/s390x/selftest.c >>> @@ -49,9 +49,9 @@ static void test_malloc(void) >>> *tmp2 = 123456789; >>> mb(); >>> >>> - report("malloc: got vaddr", (uintptr_t)tmp & 0xf000000000000000ul); >>> + report("malloc: got vaddr", !!((uintptr_t)tmp & 0xf000000000000000ul)); >>> report("malloc: access works", *tmp == 123456789); >>> - report("malloc: got 2nd vaddr", (uintptr_t)tmp2 & 0xf000000000000000ul); >>> + report("malloc: got 2nd vaddr", !!((uintptr_t)tmp2 & 0xf000000000000000ul)); >>> report("malloc: access works", (*tmp2 == 123456789)); >>> report("malloc: addresses differ", tmp != tmp2); >>> >>> >> >> See >> >> https://lore.kernel.org/kvm/CAGG=3QUdVBg5JArMaBcRbBLrHqLLCpAcrtvgT4q1h0V7SHbbEQ@mail.gmail.com/T/ >> > > I completely missed that patch and only looked for fixpatches on the > list -_- > > If possible CC me if something like this turns up, so I don't have the > CI flashing red lights at me unexpectedly :) Will do in case I don't forget :)
diff --git a/s390x/selftest.c b/s390x/selftest.c index f4acdc4..9cd6943 100644 --- a/s390x/selftest.c +++ b/s390x/selftest.c @@ -49,9 +49,9 @@ static void test_malloc(void) *tmp2 = 123456789; mb(); - report("malloc: got vaddr", (uintptr_t)tmp & 0xf000000000000000ul); + report("malloc: got vaddr", !!((uintptr_t)tmp & 0xf000000000000000ul)); report("malloc: access works", *tmp == 123456789); - report("malloc: got 2nd vaddr", (uintptr_t)tmp2 & 0xf000000000000000ul); + report("malloc: got 2nd vaddr", !!((uintptr_t)tmp2 & 0xf000000000000000ul)); report("malloc: access works", (*tmp2 == 123456789)); report("malloc: addresses differ", tmp != tmp2);
Commit c09c54c ("lib: use an argument which doesn't require default argument promotion") broke the selftest. Let's fix it by converting the binary operations to bool. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- s390x/selftest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)