This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG5afff86d2616: [clang][cli] CompilerInvocationTest: split
enum test into two (authored by jansvoboda11).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D92827/new/
https://reviews.llvm.org/D92827
Files:
clang/unittests/Frontend/CompilerInvocationTest.cpp
Index: clang/unittests/Frontend/CompilerInvocationTest.cpp
===================================================================
--- clang/unittests/Frontend/CompilerInvocationTest.cpp
+++ clang/unittests/Frontend/CompilerInvocationTest.cpp
@@ -17,9 +17,7 @@
using namespace clang;
using ::testing::Contains;
-using ::testing::Each;
using ::testing::StrEq;
-using ::testing::StrNe;
namespace {
class CommandLineTest : public ::testing::Test {
@@ -117,27 +115,26 @@
ASSERT_THAT(GeneratedArgs, Contains(StrEq(DefaultTriple.c_str())));
}
-TEST_F(CommandLineTest, CanGenerateCC1CommandLineSeparateEnum) {
- const char *RelocationModelCStr = "static";
- const char *Args[] = {"clang", "-xc++", "-mrelocation-model",
- RelocationModelCStr, "-"};
+TEST_F(CommandLineTest, CanGenerateCC1CommandLineSeparateEnumNonDefault) {
+ const char *Args[] = {"clang", "-xc++", "-mrelocation-model", "static", "-"};
CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
Invocation.generateCC1CommandLine(GeneratedArgs, *this);
- // Non default relocation model
- ASSERT_THAT(GeneratedArgs, Contains(StrEq(RelocationModelCStr)));
- GeneratedArgs.clear();
+ // Non default relocation model.
+ ASSERT_THAT(GeneratedArgs, Contains(StrEq("static")));
+}
+
+TEST_F(CommandLineTest, CanGenerateCC1COmmandLineSeparateEnumDefault) {
+ const char *Args[] = {"clang", "-xc++", "-mrelocation-model", "pic", "-"};
- RelocationModelCStr = "pic";
- Args[3] = RelocationModelCStr;
+ CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
- CompilerInvocation Invocation2;
- CompilerInvocation::CreateFromArgs(Invocation2, Args, *Diags);
+ Invocation.generateCC1CommandLine(GeneratedArgs, *this);
- Invocation2.generateCC1CommandLine(GeneratedArgs, *this);
- ASSERT_THAT(GeneratedArgs, Each(StrNe(RelocationModelCStr)));
+ // Default relocation model.
+ ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("pic"))));
}
TEST_F(CommandLineTest, NotPresentNegativeFlagNotGenerated) {
Index: clang/unittests/Frontend/CompilerInvocationTest.cpp
===================================================================
--- clang/unittests/Frontend/CompilerInvocationTest.cpp
+++ clang/unittests/Frontend/CompilerInvocationTest.cpp
@@ -17,9 +17,7 @@
using namespace clang;
using ::testing::Contains;
-using ::testing::Each;
using ::testing::StrEq;
-using ::testing::StrNe;
namespace {
class CommandLineTest : public ::testing::Test {
@@ -117,27 +115,26 @@
ASSERT_THAT(GeneratedArgs, Contains(StrEq(DefaultTriple.c_str())));
}
-TEST_F(CommandLineTest, CanGenerateCC1CommandLineSeparateEnum) {
- const char *RelocationModelCStr = "static";
- const char *Args[] = {"clang", "-xc++", "-mrelocation-model",
- RelocationModelCStr, "-"};
+TEST_F(CommandLineTest, CanGenerateCC1CommandLineSeparateEnumNonDefault) {
+ const char *Args[] = {"clang", "-xc++", "-mrelocation-model", "static", "-"};
CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
Invocation.generateCC1CommandLine(GeneratedArgs, *this);
- // Non default relocation model
- ASSERT_THAT(GeneratedArgs, Contains(StrEq(RelocationModelCStr)));
- GeneratedArgs.clear();
+ // Non default relocation model.
+ ASSERT_THAT(GeneratedArgs, Contains(StrEq("static")));
+}
+
+TEST_F(CommandLineTest, CanGenerateCC1COmmandLineSeparateEnumDefault) {
+ const char *Args[] = {"clang", "-xc++", "-mrelocation-model", "pic", "-"};
- RelocationModelCStr = "pic";
- Args[3] = RelocationModelCStr;
+ CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
- CompilerInvocation Invocation2;
- CompilerInvocation::CreateFromArgs(Invocation2, Args, *Diags);
+ Invocation.generateCC1CommandLine(GeneratedArgs, *this);
- Invocation2.generateCC1CommandLine(GeneratedArgs, *this);
- ASSERT_THAT(GeneratedArgs, Each(StrNe(RelocationModelCStr)));
+ // Default relocation model.
+ ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("pic"))));
}
TEST_F(CommandLineTest, NotPresentNegativeFlagNotGenerated) {
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
