diff options
author | Rui Ueyama <ruiu@google.com> | 2015-04-10 21:57:06 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2015-04-10 21:57:06 +0000 |
commit | d1ffa525efe25535fa30abbb3a2bf78993ff15dd (patch) | |
tree | ff2ca5f49c810002a7be54606c61d8a14530d625 /lld/unittests | |
parent | 1ca81a99c635574ea8fccd4f8e71ca9e3c355ca8 (diff) |
PECOFF: Use C++11 braced init list to make Version objects.
Diffstat (limited to 'lld/unittests')
-rw-r--r-- | lld/unittests/DriverTests/WinLinkDriverTest.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lld/unittests/DriverTests/WinLinkDriverTest.cpp b/lld/unittests/DriverTests/WinLinkDriverTest.cpp index c2bc455aa81..f7717f95a10 100644 --- a/lld/unittests/DriverTests/WinLinkDriverTest.cpp +++ b/lld/unittests/DriverTests/WinLinkDriverTest.cpp @@ -45,8 +45,8 @@ TEST_F(WinLinkParserTest, Basic) { // Unspecified flags will have default values. EXPECT_FALSE(_ctx.isDll()); - EXPECT_EQ(6, _ctx.getMinOSVersion().majorVersion); - EXPECT_EQ(0, _ctx.getMinOSVersion().minorVersion); + EXPECT_EQ(6, _ctx.getMinOSVersion().major); + EXPECT_EQ(0, _ctx.getMinOSVersion().minor); EXPECT_EQ(0x400000U, _ctx.getBaseAddress()); EXPECT_EQ(1024 * 1024U, _ctx.getStackReserve()); EXPECT_EQ(4096U, _ctx.getStackCommit()); @@ -230,28 +230,28 @@ TEST_F(WinLinkParserTest, MachineUnknown) { TEST_F(WinLinkParserTest, MajorImageVersion) { EXPECT_TRUE(parse("link.exe", "/version:7", "foo.o", nullptr)); - EXPECT_EQ(7, _ctx.getImageVersion().majorVersion); - EXPECT_EQ(0, _ctx.getImageVersion().minorVersion); + EXPECT_EQ(7, _ctx.getImageVersion().major); + EXPECT_EQ(0, _ctx.getImageVersion().minor); } TEST_F(WinLinkParserTest, MajorMinorImageVersion) { EXPECT_TRUE(parse("link.exe", "/version:72.35", "foo.o", nullptr)); - EXPECT_EQ(72, _ctx.getImageVersion().majorVersion); - EXPECT_EQ(35, _ctx.getImageVersion().minorVersion); + EXPECT_EQ(72, _ctx.getImageVersion().major); + EXPECT_EQ(35, _ctx.getImageVersion().minor); } TEST_F(WinLinkParserTest, MinMajorOSVersion) { EXPECT_TRUE(parse("link.exe", "/subsystem:windows,3", "foo.o", nullptr)); EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_GUI, _ctx.getSubsystem()); - EXPECT_EQ(3, _ctx.getMinOSVersion().majorVersion); - EXPECT_EQ(0, _ctx.getMinOSVersion().minorVersion); + EXPECT_EQ(3, _ctx.getMinOSVersion().major); + EXPECT_EQ(0, _ctx.getMinOSVersion().minor); } TEST_F(WinLinkParserTest, MinMajorMinorOSVersion) { EXPECT_TRUE(parse("link.exe", "/subsystem:windows,3.1", "foo.o", nullptr)); EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_GUI, _ctx.getSubsystem()); - EXPECT_EQ(3, _ctx.getMinOSVersion().majorVersion); - EXPECT_EQ(1, _ctx.getMinOSVersion().minorVersion); + EXPECT_EQ(3, _ctx.getMinOSVersion().major); + EXPECT_EQ(1, _ctx.getMinOSVersion().minor); } TEST_F(WinLinkParserTest, Base) { |