tools: fix ARRAY_SIZE defines in tools and selftests hdrs
tools/include/linux/kernel.h and kselftest_harness.h are missing ifndef guard around ARRAY_SIZE define. Fix them to avoid duplicate define errors during compile when another file defines it. This problem was found when compiling selftests that include a header with ARRAY_SIZE define. ARRAY_SIZE is defined in several selftests. There are about 25+ duplicate defines in various selftests source and header files. Add ARRAY_SIZE to kselftest.h in preparation for removing duplicate ARRAY_SIZE defines from individual test files. Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
Родитель
a738a4ce84
Коммит
066b34aa54
|
@ -92,7 +92,9 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
|
||||||
int scnprintf(char * buf, size_t size, const char * fmt, ...);
|
int scnprintf(char * buf, size_t size, const char * fmt, ...);
|
||||||
int scnprintf_pad(char * buf, size_t size, const char * fmt, ...);
|
int scnprintf_pad(char * buf, size_t size, const char * fmt, ...);
|
||||||
|
|
||||||
|
#ifndef ARRAY_SIZE
|
||||||
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
|
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
|
||||||
|
#endif
|
||||||
|
|
||||||
#define current_gfp_context(k) 0
|
#define current_gfp_context(k) 0
|
||||||
#define synchronize_rcu()
|
#define synchronize_rcu()
|
||||||
|
|
|
@ -48,6 +48,10 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#ifndef ARRAY_SIZE
|
||||||
|
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
|
||||||
|
#endif
|
||||||
|
|
||||||
/* define kselftest exit codes */
|
/* define kselftest exit codes */
|
||||||
#define KSFT_PASS 0
|
#define KSFT_PASS 0
|
||||||
#define KSFT_FAIL 1
|
#define KSFT_FAIL 1
|
||||||
|
|
|
@ -671,7 +671,9 @@
|
||||||
#define EXPECT_STRNE(expected, seen) \
|
#define EXPECT_STRNE(expected, seen) \
|
||||||
__EXPECT_STR(expected, seen, !=, 0)
|
__EXPECT_STR(expected, seen, !=, 0)
|
||||||
|
|
||||||
|
#ifndef ARRAY_SIZE
|
||||||
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
|
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Support an optional handler after and ASSERT_* or EXPECT_*. The approach is
|
/* 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.
|
* not thread-safe, but it should be fine in most sane test scenarios.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче