[PATCH] D94197: Fix failing triple test for macOS 11 with non-zero minor versions.
Amara Emerson via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 6 14:42:09 PST 2021
aemerson created this revision.
aemerson added a reviewer: arphaman.
aemerson added a project: LLVM.
aemerson requested review of this revision.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D94197
Files:
llvm/unittests/ADT/TripleTest.cpp
llvm/unittests/Support/Host.cpp
Index: llvm/unittests/Support/Host.cpp
===================================================================
--- llvm/unittests/Support/Host.cpp
+++ llvm/unittests/Support/Host.cpp
@@ -348,9 +348,15 @@
unsigned HostMajor, HostMinor, HostMicro;
ASSERT_EQ(HostTriple.getMacOSXVersion(HostMajor, HostMinor, HostMicro), true);
- // Don't compare the 'Micro' version, as it's always '0' for the 'Darwin'
- // triples.
- ASSERT_EQ(std::tie(SystemMajor, SystemMinor), std::tie(HostMajor, HostMinor));
+ if (SystemMajor > 10) {
+ // Don't compare the 'Minor' and 'Micro' versions, as they're always '0' for
+ // the 'Darwin' triples on 11.x.
+ ASSERT_EQ(SystemMajor, HostMajor);
+ } else {
+ // Don't compare the 'Micro' version, as it's always '0' for the 'Darwin'
+ // triples.
+ ASSERT_EQ(std::tie(SystemMajor, SystemMinor), std::tie(HostMajor, HostMinor));
+ }
}
#endif
Index: llvm/unittests/ADT/TripleTest.cpp
===================================================================
--- llvm/unittests/ADT/TripleTest.cpp
+++ llvm/unittests/ADT/TripleTest.cpp
@@ -1264,6 +1264,14 @@
EXPECT_EQ((unsigned)0, Minor);
EXPECT_EQ((unsigned)0, Micro);
+ // For darwin triples on macOS 11, only compare the major version.
+ T = Triple("x86_64-apple-darwin20.2");
+ EXPECT_TRUE(T.isMacOSX());
+ T.getMacOSXVersion(Major, Minor, Micro);
+ EXPECT_EQ((unsigned)11, Major);
+ EXPECT_EQ((unsigned)0, Minor);
+ EXPECT_EQ((unsigned)0, Micro);
+
T = Triple("armv7-apple-ios");
EXPECT_FALSE(T.isMacOSX());
EXPECT_TRUE(T.isiOS());
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D94197.314993.patch
Type: text/x-patch
Size: 1561 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210106/4aee5cc6/attachment.bin>
More information about the llvm-commits
mailing list