fix clang-format and use do-while in ASSERT_ macro.

Author: vonosmas

libc/test/UnitTest/Test.h

@@ -41,12 +41,16 @@
 // they all provide.
 
 #define ASSERT_ERRNO_EQ(VAL)                                                   \
-  ASSERT_EQ(VAL, static_cast<int>(LIBC_NAMESPACE::libc_errno));                \
-  LIBC_NAMESPACE::libc_errno = 0
+  do {                                                                         \
+    ASSERT_EQ(VAL, static_cast<int>(LIBC_NAMESPACE::libc_errno));              \
+    LIBC_NAMESPACE::libc_errno = 0;                                            \
+  } while (0)
 #define ASSERT_ERRNO_SUCCESS()                                                 \
   ASSERT_EQ(0, static_cast<int>(LIBC_NAMESPACE::libc_errno))
 #define ASSERT_ERRNO_FAILURE()                                                 \
-  ASSERT_NE(0, static_cast<int>(LIBC_NAMESPACE::libc_errno));                  \
-  LIBC_NAMESPACE::libc_errno = 0
+  do {                                                                         \
+    ASSERT_NE(0, static_cast<int>(LIBC_NAMESPACE::libc_errno));                \
+    LIBC_NAMESPACE::libc_errno = 0;                                            \
+  } while (0)
 
 #endif // LLVM_LIBC_TEST_UNITTEST_TEST_H

libc/test/src/unistd/access_test.cpp

@@ -22,8 +22,8 @@ using LlvmLibcAccessTest = LIBC_NAMESPACE::testing::ErrnoCheckingTest;
 TEST_F(LlvmLibcAccessTest, CreateAndTest) {
   // The test strategy is to repeatedly create a file in different modes and
   // test that it is accessable in those modes but not in others.
-  using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
   using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
+  using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
   constexpr const char *FILENAME = "access.test";
   auto TEST_FILE = libc_make_test_file_path(FILENAME);
   int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);