summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx.manpages@gmail.com>2021-11-19 19:15:53 +0100
committerAlejandro Colomar <alx.manpages@gmail.com>2021-11-20 14:45:33 +0100
commitc35ca31451ef96e005a4e0545f7cf00650d67152 (patch)
treecb23a929de6e18a6396bb1e409a7f1860d980fca
parent76fce3e8f3bd4e13fa3b058d72213f049059498a (diff)
tools/testing/selftests/kselftest_harness.h: Don't redefine ARRAY_SIZE()
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
-rw-r--r--tools/testing/selftests/kselftest_harness.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index ae0f0f33b2a6..9df7092f8630 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -50,10 +50,12 @@
#ifndef __KSELFTEST_HARNESS_H
#define __KSELFTEST_HARNESS_H
+
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <asm/types.h>
+#include <linux/array_size.h>
#include <errno.h>
#include <stdbool.h>
#include <stdint.h>
@@ -67,6 +69,7 @@
#include "kselftest.h"
+
#define TEST_TIMEOUT_DEFAULT 30
/* Utilities exposed to the test definitions */
@@ -671,8 +674,6 @@
#define EXPECT_STRNE(expected, seen) \
__EXPECT_STR(expected, seen, !=, 0)
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-
/* 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.
*