From 45f9939f9a588d362f1a0202fde95856b5d8bd70 Mon Sep 17 00:00:00 2001 From: Matt Coster Date: Thu, 9 Jun 2022 14:52:37 +0100 Subject: [PATCH] amd: Unify naming of CONCAT/PASTE macros In compiler/tests/framework.h: - _PASTE => PASTE2 - PASTE => CONCAT2 Signed-off-by: Matt Coster Reviewed-by: Alyssa Rosenzweig Part-of: --- src/amd/compiler/tests/framework.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/amd/compiler/tests/framework.h b/src/amd/compiler/tests/framework.h index f16301d074d..acca823cb78 100644 --- a/src/amd/compiler/tests/framework.h +++ b/src/amd/compiler/tests/framework.h @@ -57,17 +57,17 @@ inline bool set_variant(amd_gfx_level cls, const char *rest="") void fail_test(const char *fmt, ...); void skip_test(const char *fmt, ...); -#define _PASTE(a, b) a##b -#define PASTE(a, b) _PASTE(a, b) +#define PASTE2(a, b) a##b +#define CONCAT2(a, b) PASTE2(a, b) -#define _BEGIN_TEST(name, struct_name) static void struct_name(); static __attribute__((constructor)) void PASTE(add_test_, __COUNTER__)() {\ +#define _BEGIN_TEST(name, struct_name) static void struct_name(); static __attribute__((constructor)) void CONCAT2(add_test_, __COUNTER__)() {\ tests[#name] = (TestDef){#name, ACO_TEST_BUILD_ROOT "/" __FILE__, &struct_name};\ }\ static void struct_name() {\ -#define BEGIN_TEST(name) _BEGIN_TEST(name, PASTE(Test_, __COUNTER__)) -#define BEGIN_TEST_TODO(name) _BEGIN_TEST(name, PASTE(Test_, __COUNTER__)) -#define BEGIN_TEST_FAIL(name) _BEGIN_TEST(name, PASTE(Test_, __COUNTER__)) +#define BEGIN_TEST(name) _BEGIN_TEST(name, CONCAT2(Test_, __COUNTER__)) +#define BEGIN_TEST_TODO(name) _BEGIN_TEST(name, CONCAT2(Test_, __COUNTER__)) +#define BEGIN_TEST_FAIL(name) _BEGIN_TEST(name, CONCAT2(Test_, __COUNTER__)) #define END_TEST \ }