This is an archive of the discontinued LLVM Phabricator instance.

Differential D123887

[HLSL][clang][Driver] Fix test error for use SmallString::data instead SmallString::c_str.
AbandonedPublic

Authored by python3kgae on Apr 15 2022, 6:55 PM.

Details

Reviewers
wolfgangp

Diff Detail

Event Timeline

python3kgae created this revision.Apr 15 2022, 6:55 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 15 2022, 6:55 PM
python3kgae requested review of this revision.Apr 15 2022, 6:55 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 15 2022, 6:55 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
python3kgae mentioned this in D122865: [HLSL][clang][Driver] Support target profile command line option..Apr 15 2022, 6:55 PM
beanz added a subscriber: beanz.Apr 15 2022, 7:08 PM

I already merged a fix to resolve the test errors.

python3kgae abandoned this revision.Apr 15 2022, 7:23 PM

Thanks. Close this RP then.

Harbormaster completed remote builds in B159902: Diff 423199.Apr 15 2022, 7:46 PM

Revision Contents

PathSize
clang/
unittests/
Driver/
10 lines

Diff 423199

clang/unittests/Driver/ToolChainTest.cpp

Show First 20 Lines • Show All 466 Lines • ▼ Show 20 LinesTEST(DxcModeTest, TargetProfileValidation) {
EXPECT_EQ(Diags.getNumErrors(), 0u); EXPECT_EQ(Diags.getNumErrors(), 0u);
// Invalid tests. // Invalid tests.
Args = TheDriver.ParseArgStrings({"-Tpss_6_1"}, false, ContainsError); Args = TheDriver.ParseArgStrings({"-Tpss_6_1"}, false, ContainsError);
EXPECT_FALSE(ContainsError); EXPECT_FALSE(ContainsError);
Triple = TC.ComputeEffectiveClangTriple(Args); Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel"); EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 1u); EXPECT_EQ(Diags.getNumErrors(), 1u);
EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : pss_6_1"); EXPECT_STREQ(DiagConsumer->Errors.back().c_str(),
"invalid profile : pss_6_1");
Diags.Clear(); Diags.Clear();
DiagConsumer->clear(); DiagConsumer->clear();
Args = TheDriver.ParseArgStrings({"-Tps_6_x"}, false, ContainsError); Args = TheDriver.ParseArgStrings({"-Tps_6_x"}, false, ContainsError);
EXPECT_FALSE(ContainsError); EXPECT_FALSE(ContainsError);
Triple = TC.ComputeEffectiveClangTriple(Args); Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel"); EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 2u); EXPECT_EQ(Diags.getNumErrors(), 2u);
EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : ps_6_x"); EXPECT_STREQ(DiagConsumer->Errors.back().c_str(), "invalid profile : ps_6_x");
Diags.Clear(); Diags.Clear();
DiagConsumer->clear(); DiagConsumer->clear();
Args = TheDriver.ParseArgStrings({"-Tlib_6_1"}, false, ContainsError); Args = TheDriver.ParseArgStrings({"-Tlib_6_1"}, false, ContainsError);
EXPECT_FALSE(ContainsError); EXPECT_FALSE(ContainsError);
Triple = TC.ComputeEffectiveClangTriple(Args); Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel"); EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 3u); EXPECT_EQ(Diags.getNumErrors(), 3u);
EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : lib_6_1"); EXPECT_STREQ(DiagConsumer->Errors.back().c_str(),
"invalid profile : lib_6_1");
Diags.Clear(); Diags.Clear();
DiagConsumer->clear(); DiagConsumer->clear();
Args = TheDriver.ParseArgStrings({"-Tfoo"}, false, ContainsError); Args = TheDriver.ParseArgStrings({"-Tfoo"}, false, ContainsError);
EXPECT_FALSE(ContainsError); EXPECT_FALSE(ContainsError);
Triple = TC.ComputeEffectiveClangTriple(Args); Triple = TC.ComputeEffectiveClangTriple(Args);
EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel"); EXPECT_STREQ(Triple.c_str(), "unknown-unknown-shadermodel");
EXPECT_EQ(Diags.getNumErrors(), 4u); EXPECT_EQ(Diags.getNumErrors(), 4u);
EXPECT_STREQ(DiagConsumer->Errors.back().data(), "invalid profile : foo"); EXPECT_STREQ(DiagConsumer->Errors.back().c_str(), "invalid profile : foo");
Diags.Clear(); Diags.Clear();
DiagConsumer->clear(); DiagConsumer->clear();
} }
} // end anonymous namespace. } // end anonymous namespace.