pragma wrap

Author: vinay-deshmukh

libc/test/UnitTest/LibcTest.h

@@ -334,8 +334,11 @@ CString libc_make_test_file_path_func(const char *file_name);
     return "[ParamType = " #TYPE "]";                                          \
   }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
+#define DO_PRAGMA_BEGIN #pragma GCC diagnostic push
+
+#define DO_PRAGMA #pragma GCC diagnostic ignored "-Wglobal-constructors"
+
+#define DO_PRAGMA_END #pragma GCC diagnostic pop
 
 #define TYPED_TEST(SuiteName, TestName, TypeList)                              \
   static_assert(                                                               \
@@ -354,8 +357,11 @@ CString libc_make_test_file_path_func(const char *file_name);
     void Run() override;                                                       \
     const char *getName() const override { return name; }                      \
   };                                                                           \
+  DO_PRAGMA_BEGIN                                                              \
+  DO_PRAGMA                                                                    \
   TypeList::Tests<SuiteName##_##TestName>::type                                \
       SuiteName##_##TestName##_Instance;                                       \
+  DO_PRAGMA_END                                                                \
   template <typename T> void SuiteName##_##TestName<T>::Run()
 
 #define TYPED_TEST_F(SuiteClass, TestName, TypeList)                           \
@@ -374,8 +380,11 @@ CString libc_make_test_file_path_func(const char *file_name);
     void Run() override;                                                       \
     const char *getName() const override { return name; }                      \
   };                                                                           \
+  DO_PRAGMA_BEGIN                                                              \
+  DO_PRAGMA                                                                    \
   TypeList::Tests<SuiteClass##_##TestName>::type                               \
       SuiteClass##_##TestName##_Instance;                                      \
+  DO_PRAGMA_END                                                                \
   template <typename T> void SuiteClass##_##TestName<T>::Run()
 
 #define TEST(SuiteName, TestName)                                              \
@@ -387,7 +396,10 @@ CString libc_make_test_file_path_func(const char *file_name);
     void Run() override;                                                       \
     const char *getName() const override { return #SuiteName "." #TestName; }  \
   };                                                                           \
+  DO_PRAGMA_BEGIN                                                              \
+  DO_PRAGMA                                                                    \
   SuiteName##_##TestName SuiteName##_##TestName##_Instance;                    \
+  DO_PRAGMA_END                                                                \
   void SuiteName##_##TestName::Run()
 
 #define TEST_F(SuiteClass, TestName)                                           \
@@ -400,11 +412,12 @@ CString libc_make_test_file_path_func(const char *file_name);
     void Run() override;                                                       \
     const char *getName() const override { return #SuiteClass "." #TestName; } \
   };                                                                           \
+  DO_PRAGMA_BEGIN                                                              \
+  DO_PRAGMA                                                                    \
   SuiteClass##_##TestName SuiteClass##_##TestName##_Instance;                  \
+  DO_PRAGMA_END                                                                \
   void SuiteClass##_##TestName::Run()
 
-#pragma GCC diagnostic pop
-
 // Helper to trick the compiler into ignoring lack of braces on the else
 // branch.  We cannot introduce braces at this point, since it would prevent
 // using `<< ...` after the test macro for additional failure output.