Reverted r304083 as it seems there is a desire to address this in the googletest.

llvm-svn: 304084

1 files changed, 3 insertions, 6 deletions

diff --git a/llvm/unittests/Support/CommandLineTest.cpp b/llvm/unittests/Support/CommandLineTest.cpp
index 9b0de45..33573c4 100644
--- a/llvm/unittests/Support/CommandLineTest.cpp
+++ b/llvm/unittests/Support/CommandLineTest.cpp
@@ -180,9 +180,8 @@ void testCommandLineTokenizer(ParserFunction *parse, StringRef Input,
   parse(Input, Saver, Actual, /*MarkEOLs=*/false);
   EXPECT_EQ(OutputSize, Actual.size());
   for (unsigned I = 0, E = Actual.size(); I != E; ++I) {
-    if (I < OutputSize) {
+    if (I < OutputSize)
       EXPECT_STREQ(Output[I], Actual[I]);
-    }
   }
 }
 
@@ -529,9 +528,8 @@ TEST(CommandLineTest, GetRegisteredSubcommands) {
   EXPECT_FALSE(Opt1);
   EXPECT_FALSE(Opt2);
   for (auto *S : cl::getRegisteredSubcommands()) {
-    if (*S) {
+    if (*S)
       EXPECT_EQ("sc1", S->getName());
-    }
   }
 
   cl::ResetAllOptionOccurrences();
@@ -540,9 +538,8 @@ TEST(CommandLineTest, GetRegisteredSubcommands) {
   EXPECT_FALSE(Opt1);
   EXPECT_FALSE(Opt2);
   for (auto *S : cl::getRegisteredSubcommands()) {
-    if (*S) {
+    if (*S)
       EXPECT_EQ("sc2", S->getName());
-    }
   }
 }