Author: Julian Lettner Date: 2021-01-12T15:23:43-08:00 New Revision: 8f5ec4593754a58a4feb835a9d44d59c655bd0d1
URL: https://github.com/llvm/llvm-project/commit/8f5ec4593754a58a4feb835a9d44d59c655bd0d1 DIFF: https://github.com/llvm/llvm-project/commit/8f5ec4593754a58a4feb835a9d44d59c655bd0d1.diff LOG: [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. Added: Modified: compiler-rt/lib/sanitizer_common/tests/sanitizer_mac_test.cpp Removed: ################################################################################ diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_mac_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_mac_test.cpp index 090947eceb4a..b149567949b5 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_mac_test.cpp +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_mac_test.cpp @@ -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 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits