This is an archive of the discontinued LLVM Phabricator instance.

Differential D113257

[unittests] [DWARF] Generalize path separator expectations
ClosedPublic

Authored by mstorsjo on Nov 5 2021, 3:16 AM.

Details

Reviewers
dblaikie
labath
aaron.ballman
Commits
rGf0955922a258: [unittests] [DWARF] Generalize path separator expectations
Summary

This fixes unit tests if running on Windows with a build configured
to prefer forward slashes.

Diff Detail

Event Timeline

mstorsjo requested review of this revision.Nov 5 2021, 3:16 AM
mstorsjo created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptNov 5 2021, 3:16 AM
Harbormaster completed remote builds in B132640: Diff 385008.Nov 5 2021, 3:58 AM
Herald added a subscriber: ormris. · View Herald TranscriptNov 5 2021, 3:58 AM
dblaikie accepted this revision.Nov 5 2021, 11:44 AM

Seems OK/not worse than the old code.

This revision is now accepted and ready to land.Nov 5 2021, 11:44 AM
This revision was landed with ongoing or failed builds.Nov 5 2021, 12:51 PM
Closed by commit rGf0955922a258: [unittests] [DWARF] Generalize path separator expectations (authored by mstorsjo). · Explain Why
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGf0955922a258: [unittests] [DWARF] Generalize path separator expectations.

Revision Contents

PathSize
llvm/
unittests/
DebugInfo/
DWARF/
40 lines

Diff 385164

llvm/unittests/DebugInfo/DWARF/DWARFDieTest.cpp

Show First 20 Lines • Show All 177 Lines • ▼ Show 20 LinesTEST(DWARFDie, getDeclFile) {
ASSERT_TRUE(Die.isValid()); ASSERT_TRUE(Die.isValid());
DWARFDie MainDie = Die.getFirstChild(); DWARFDie MainDie = Die.getFirstChild();
ASSERT_TRUE(MainDie.isValid()); ASSERT_TRUE(MainDie.isValid());
std::string DeclFile = MainDie.getDeclFile( std::string DeclFile = MainDie.getDeclFile(
DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath); DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath);
#if defined(_WIN32) std::string Ref =
EXPECT_EQ(DeclFile, "/tmp\\main.cpp"); ("/tmp" + llvm::sys::path::get_separator() + "main.cpp").str();
#else EXPECT_EQ(DeclFile, Ref);
EXPECT_EQ(DeclFile, "/tmp/main.cpp");
#endif
} }
TEST(DWARFDie, getDeclFileAbstractOrigin) { TEST(DWARFDie, getDeclFileAbstractOrigin) {
const char *yamldata = R"( const char *yamldata = R"(
debug_str: debug_str:
- '' - ''
debug_abbrev: debug_abbrev:
- ID: 0 - ID: 0
▲ Show 20 Lines • Show All 87 Lines • ▼ Show 20 LinesTEST(DWARFDie, getDeclFileAbstractOrigin) {
ASSERT_TRUE(Die.isValid()); ASSERT_TRUE(Die.isValid());
DWARFDie MainDie = Die.getFirstChild(); DWARFDie MainDie = Die.getFirstChild();
ASSERT_TRUE(MainDie.isValid()); ASSERT_TRUE(MainDie.isValid());
std::string DeclFile = MainDie.getDeclFile( std::string DeclFile = MainDie.getDeclFile(
DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath); DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath);
#if defined(_WIN32) std::string Ref =
EXPECT_EQ(DeclFile, "/tmp\\main.cpp"); ("/tmp" + llvm::sys::path::get_separator() + "main.cpp").str();
#else EXPECT_EQ(DeclFile, Ref);
EXPECT_EQ(DeclFile, "/tmp/main.cpp");
#endif
} }
TEST(DWARFDie, getDeclFileSpecification) { TEST(DWARFDie, getDeclFileSpecification) {
const char *yamldata = R"( const char *yamldata = R"(
debug_str: debug_str:
- '' - ''
debug_abbrev: debug_abbrev:
- ID: 0 - ID: 0
▲ Show 20 Lines • Show All 86 Lines • ▼ Show 20 LinesTEST(DWARFDie, getDeclFileSpecification) {
ASSERT_TRUE(Die.isValid()); ASSERT_TRUE(Die.isValid());
DWARFDie MainDie = Die.getFirstChild(); DWARFDie MainDie = Die.getFirstChild();
ASSERT_TRUE(MainDie.isValid()); ASSERT_TRUE(MainDie.isValid());
std::string DeclFile = MainDie.getDeclFile( std::string DeclFile = MainDie.getDeclFile(
DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath); DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath);
#if defined(_WIN32) std::string Ref =
EXPECT_EQ(DeclFile, "/tmp\\main.cpp"); ("/tmp" + llvm::sys::path::get_separator() + "main.cpp").str();
#else EXPECT_EQ(DeclFile, Ref);
EXPECT_EQ(DeclFile, "/tmp/main.cpp");
#endif
} }
TEST(DWARFDie, getDeclFileAbstractOriginAcrossCUBoundary) { TEST(DWARFDie, getDeclFileAbstractOriginAcrossCUBoundary) {
const char *yamldata = R"( const char *yamldata = R"(
debug_str: debug_str:
- '' - ''
debug_abbrev: debug_abbrev:
- ID: 0 - ID: 0
▲ Show 20 Lines • Show All 103 Lines • ▼ Show 20 LinesTEST(DWARFDie, getDeclFileAbstractOriginAcrossCUBoundary) {
ASSERT_TRUE(Die.isValid()); ASSERT_TRUE(Die.isValid());
DWARFDie MainDie = Die.getFirstChild(); DWARFDie MainDie = Die.getFirstChild();
ASSERT_TRUE(MainDie.isValid()); ASSERT_TRUE(MainDie.isValid());
std::string DeclFile = MainDie.getDeclFile( std::string DeclFile = MainDie.getDeclFile(
DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath); DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath);
#if defined(_WIN32) std::string Ref =
EXPECT_EQ(DeclFile, "/tmp\\main.cpp"); ("/tmp" + llvm::sys::path::get_separator() + "main.cpp").str();
#else EXPECT_EQ(DeclFile, Ref);
EXPECT_EQ(DeclFile, "/tmp/main.cpp");
#endif
} }
TEST(DWARFDie, getDeclFileSpecificationAcrossCUBoundary) { TEST(DWARFDie, getDeclFileSpecificationAcrossCUBoundary) {
const char *yamldata = R"( const char *yamldata = R"(
debug_str: debug_str:
- '' - ''
debug_abbrev: debug_abbrev:
- ID: 0 - ID: 0
▲ Show 20 Lines • Show All 103 Lines • ▼ Show 20 LinesTEST(DWARFDie, getDeclFileSpecificationAcrossCUBoundary) {
ASSERT_TRUE(Die.isValid()); ASSERT_TRUE(Die.isValid());
DWARFDie MainDie = Die.getFirstChild(); DWARFDie MainDie = Die.getFirstChild();
ASSERT_TRUE(MainDie.isValid()); ASSERT_TRUE(MainDie.isValid());
std::string DeclFile = MainDie.getDeclFile( std::string DeclFile = MainDie.getDeclFile(
DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath); DILineInfoSpecifier::FileLineInfoKind::AbsoluteFilePath);
#if defined(_WIN32) std::string Ref =
EXPECT_EQ(DeclFile, "/tmp\\main.cpp"); ("/tmp" + llvm::sys::path::get_separator() + "main.cpp").str();
#else EXPECT_EQ(DeclFile, Ref);
EXPECT_EQ(DeclFile, "/tmp/main.cpp");
#endif
} }
} // end anonymous namespace } // end anonymous namespace