Skip to content

Commit c657e93

Browse files
Julian Lettneryln
authored andcommitted
[Sanitizer][Darwin] Fix test for macOS 11+ point releases
This test wrongly asserted that the minor version is always 0 when running on macOS 11 and above. (cherry picked from commit 8f5ec45) rdar://79788793
1 parent 3dc8b35 commit c657e93

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

compiler-rt/lib/sanitizer_common/tests/sanitizer_mac_test.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,18 @@ TEST(SanitizerMac, GetMacosAlignedVersion) {
5656
#else
5757
TEST(SanitizerMac, GetMacosAlignedVersion) {
5858
MacosVersion vers = GetMacosAlignedVersion();
59-
u16 kernel_major = GetDarwinKernelVersion().major;
60-
bool macos_11 = (kernel_major >= 20);
61-
u16 expected_major = macos_11 ? (kernel_major - 9) : 10;
62-
u16 expected_minor = macos_11 ? 0 : (kernel_major - 4);
63-
EXPECT_EQ(vers.major, expected_major);
64-
EXPECT_EQ(vers.minor, expected_minor);
59+
std::ostringstream oss;
60+
oss << vers.major << '.' << vers.minor;
61+
std::string actual = oss.str();
62+
63+
char buf[100];
64+
size_t len = sizeof(buf);
65+
int res = sysctlbyname("kern.osproductversion", buf, &len, nullptr, 0);
66+
ASSERT_EQ(res, KERN_SUCCESS);
67+
std::string expected(buf);
68+
69+
// Prefix match
70+
ASSERT_EQ(expected.compare(0, actual.size(), actual), 0);
6571
}
6672
#endif
6773

0 commit comments

Comments
 (0)