Reland http://codereview.chromium.org/7648033

ppapi/tests/test_case.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_TESTS_TEST_CASE_H_
 #define PPAPI_TESTS_TEST_CASE_H_
 
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 112 matching lines @@
     return new Test##name(instance);                                        \
   }                                                                         \
   static TestCaseFactory g_Test##name_factory(                              \
     #name, &Test##name##_FactoryMethod                                      \
   )
 
 // Helper macro for calling functions implementing specific tests in the
 // RunTest function. This assumes the function name is TestFoo where Foo is the
 // test |name|.
 #define RUN_TEST(name) \
-  force_async_ = false; \
-  instance_->LogTest(#name, Test##name());
+  do { \
+    force_async_ = false; \
+    instance_->LogTest(#name, Test##name()); \
+  } while (false)
 
 // Like RUN_TEST above but forces functions taking callbacks to complete
 // asynchronously on success or error.
 #define RUN_TEST_FORCEASYNC(name) \
-  force_async_ = true; \
-  instance_->LogTest(#name"ForceAsync", Test##name());
+  do { \
+    force_async_ = true; \
+    instance_->LogTest(#name"ForceAsync", Test##name()); \
+  } while (false)
 
 #define RUN_TEST_FORCEASYNC_AND_NOT(name) \
-  RUN_TEST_FORCEASYNC(name); \
-  RUN_TEST(name);
+  do { \
+    RUN_TEST_FORCEASYNC(name); \
+    RUN_TEST(name); \
+  } while (false)
 
 
 // Helper macros for checking values in tests, and returning a location
 // description of the test fails.
 #define ASSERT_TRUE(cmd) \
   if (!(cmd)) { \
     return MakeFailureMessage(__FILE__, __LINE__, #cmd); \
   }
 #define ASSERT_FALSE(cmd) ASSERT_TRUE(!(cmd))
 #define ASSERT_EQ(a, b) ASSERT_TRUE((a) == (b))
 #define ASSERT_NE(a, b) ASSERT_TRUE((a) != (b))
 
 #define ASSERT_DOUBLE_EQ(a, b) ASSERT_TRUE( \
     std::fabs((a)-(b)) <= std::numeric_limits<double>::epsilon())
 
 #define PASS() return std::string()
 
 #endif  // PPAPI_TESTS_TEST_CASE_H_