| Message ID | 20210625224902.1222942-1-posk@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | kselftest/kselftest_harness.h: do not redefine ARRAY_SIZE | expand |
On 6/25/21 4:49 PM, Peter Oskolkov wrote: > Macro ARRAY_SIZE is defined in tools/include/linux/kernel.h, so > if both headers are included there is a warning. > > Signed-off-by: Peter Oskolkov <posk@google.com> > --- > tools/testing/selftests/kselftest_harness.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h > index ae0f0f33b2a6..75164e23f036 100644 > --- a/tools/testing/selftests/kselftest_harness.h > +++ b/tools/testing/selftests/kselftest_harness.h > @@ -671,7 +671,9 @@ > #define EXPECT_STRNE(expected, seen) \ > __EXPECT_STR(expected, seen, !=, 0) > > +#ifndef ARRAY_SIZE > #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) > +#endif > > /* Support an optional handler after and ASSERT_* or EXPECT_*. The approach is > * not thread-safe, but it should be fine in most sane test scenarios. > Thank you for the patch. This will be queued for rc2 after the merge window closes. thanks, -- Shuah
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index ae0f0f33b2a6..75164e23f036 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -671,7 +671,9 @@ #define EXPECT_STRNE(expected, seen) \ __EXPECT_STR(expected, seen, !=, 0) +#ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) +#endif /* Support an optional handler after and ASSERT_* or EXPECT_*. The approach is * not thread-safe, but it should be fine in most sane test scenarios.
Macro ARRAY_SIZE is defined in tools/include/linux/kernel.h, so if both headers are included there is a warning. Signed-off-by: Peter Oskolkov <posk@google.com> --- tools/testing/selftests/kselftest_harness.h | 2 ++ 1 file changed, 2 insertions(+)