Skip to content

[Sanitizer][Darwin] Fix test for macOS 11+ point releases #3057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2021
Merged

[Sanitizer][Darwin] Fix test for macOS 11+ point releases #3057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions compiler-rt/lib/sanitizer_common/tests/sanitizer_mac_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,18 @@ TEST(SanitizerMac, GetMacosAlignedVersion) {
#else
TEST(SanitizerMac, GetMacosAlignedVersion) {
MacosVersion vers = GetMacosAlignedVersion();
u16 kernel_major = GetDarwinKernelVersion().major;
bool macos_11 = (kernel_major >= 20);
u16 expected_major = macos_11 ? (kernel_major - 9) : 10;
u16 expected_minor = macos_11 ? 0 : (kernel_major - 4);
EXPECT_EQ(vers.major, expected_major);
EXPECT_EQ(vers.minor, expected_minor);
std::ostringstream oss;
oss << vers.major << '.' << vers.minor;
std::string actual = oss.str();

char buf[100];
size_t len = sizeof(buf);
int res = sysctlbyname("kern.osproductversion", buf, &len, nullptr, 0);
ASSERT_EQ(res, KERN_SUCCESS);
std::string expected(buf);

// Prefix match
ASSERT_EQ(expected.compare(0, actual.size(), actual), 0);
}
#endif

Expand Down