maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[TextAPI] clean up auto usages in tests, NFC

This commit is contained in:
Cyndy Ishida 2020-09-18 12:22:46 -07:00
parent 0a6860521e
commit 0b15cb70d3
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/unittests/TextAPI/TextStubHelpers.h
View File

@ -25,6 +25,7 @@ struct ExportedSymbol {
using ExportedSymbolSeq = std::vector<ExportedSymbol>;
using UUIDs = std::vector<std::pair<llvm::MachO::Target, std::string>>;
using TBDFile = std::unique_ptr<MachO::InterfaceFile>;
using TBDReexportFile = std::shared_ptr<MachO::InterfaceFile>;
inline bool operator<(const ExportedSymbol &LHS, const ExportedSymbol &RHS) {
return std::tie(LHS.Kind, LHS.Name) < std::tie(RHS.Kind, RHS.Name);

2
llvm/unittests/TextAPI/TextStubV3Tests.cpp
View File

@ -211,7 +211,7 @@ TEST(TBDv3, ReadMultipleDocuments) {
// Check Second Document
Exports.clear();
auto Document = File->documents().front();
TBDReexportFile Document = File->documents().front();
EXPECT_EQ(FileType::TBD_V3, Document->getFileType());
EXPECT_EQ(Archs, Document->getArchitectures());
EXPECT_EQ(Uuids, Document->uuids());

30
llvm/unittests/TextAPI/TextStubV4Tests.cpp
View File

@ -277,7 +277,7 @@ TEST(TBDv4, ReadMultipleDocuments) {
{Targets[1], "21111111-1111-1111-1111-111111111111"},
};
auto Document = File->documents().front();
TBDReexportFile Document = File->documents().front();
EXPECT_EQ(FileType::TBD_V4, Document->getFileType());
EXPECT_EQ(Archs, Document->getArchitectures());
EXPECT_EQ(Uuids, Document->uuids());
@ -505,7 +505,7 @@ TEST(TBDv4, MultipleTargets) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4MultipleTargets),
stripWhitespace(Buffer.c_str()));
@ -534,7 +534,7 @@ TEST(TBDv4, MultipleTargetsSameArch) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4TargetsSameArch),
stripWhitespace(Buffer.c_str()));
@ -559,7 +559,7 @@ TEST(TBDv4, MultipleTargetsSamePlatform) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4MultipleTargetsSamePlatform),
stripWhitespace(Buffer.c_str()));
@ -584,7 +584,7 @@ TEST(TBDv4, Target_maccatalyst) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4TargetMacCatalyst),
stripWhitespace(Buffer.c_str()));
@ -608,7 +608,7 @@ TEST(TBDv4, Target_x86_ios) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4Targetx86iOS),
stripWhitespace(Buffer.c_str()));
@ -632,7 +632,7 @@ TEST(TBDv4, Target_arm_bridgeOS) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4PlatformBridgeOS),
stripWhitespace(Buffer.c_str()));
@ -656,7 +656,7 @@ TEST(TBDv4, Target_arm_iOS) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4ArchArm64e), stripWhitespace(Buffer.c_str()));
}
@ -679,7 +679,7 @@ TEST(TBDv4, Target_x86_macos) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4Targetx86MacOS),
stripWhitespace(Buffer.c_str()));
@ -704,7 +704,7 @@ TEST(TBDv4, Target_x86_ios_simulator) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4Targetx86iOSSim),
stripWhitespace(Buffer.c_str()));
@ -728,7 +728,7 @@ TEST(TBDv4, Target_x86_tvos_simulator) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4x86tvOSSim), stripWhitespace(Buffer.c_str()));
}
@ -752,7 +752,7 @@ TEST(TBDv4, Target_i386_watchos_simulator) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4i386watchOSSim),
stripWhitespace(Buffer.c_str()));
@ -776,7 +776,7 @@ TEST(TBDv4, Target_i386_driverkit) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4i386DriverKit),
stripWhitespace(Buffer.c_str()));
@ -835,7 +835,7 @@ TEST(TBDv4, Swift_5) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4SwiftVersion5),
stripWhitespace(Buffer.c_str()));
@ -858,7 +858,7 @@ TEST(TBDv4, Swift_99) {
SmallString<4096> Buffer;
raw_svector_ostream OS(Buffer);
auto WriteResult = TextAPIWriter::writeToStream(OS, *File);
Error WriteResult = TextAPIWriter::writeToStream(OS, *File);
EXPECT_TRUE(!WriteResult);
EXPECT_EQ(stripWhitespace(TBDv4SwiftVersion99),
stripWhitespace(Buffer.c_str()));