git: 9ea5cc1453f5 - stable/13 - Un-XFAIL two tests with Clang > 10

[Alex Richardson]

The branch stable/13 has been updated by arichardson:

URL: https://cgit.FreeBSD.org/src/commit/?id=9ea5cc1453f55a327a1a5d2eae4e9ebf7c9d646b

commit 9ea5cc1453f55a327a1a5d2eae4e9ebf7c9d646b
Author:     Alex Richardson <arichardson at FreeBSD.org>
AuthorDate: 2021-01-28 17:17:49 +0000
Commit:     Alex Richardson <arichardson at FreeBSD.org>
CommitDate: 2021-03-17 09:54:27 +0000

    Un-XFAIL two tests with Clang > 10
    
    SVN r343917 fixed this for in-tree clang, but when building with a newer
    out-of-tree clang the test was still marked as XFAIL.
    
    Reviewed By:    dim
    Differential Revision: https://reviews.freebsd.org/D28390
    
    (cherry picked from commit 83ff5d5d98cbcf9b66dccd70022358aec8918a14)
---
 contrib/netbsd-tests/lib/libm/t_cbrt.c | 4 ++--
 lib/msun/tests/trig_test.c             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/netbsd-tests/lib/libm/t_cbrt.c b/contrib/netbsd-tests/lib/libm/t_cbrt.c
index d2cdd47a5beb..08e9faeb145c 100644
--- a/contrib/netbsd-tests/lib/libm/t_cbrt.c
+++ b/contrib/netbsd-tests/lib/libm/t_cbrt.c
@@ -269,8 +269,8 @@ ATF_TC_BODY(cbrtl_powl, tc)
 	size_t i;
 
 #if defined(__amd64__) && defined(__clang__) && __clang_major__ >= 7 && \
-    __FreeBSD_cc_version < 1300002
-	atf_tc_expect_fail("test fails with clang 7+ - bug 234040");
+    __clang_major__ < 10 && __FreeBSD_cc_version < 1300002
+	atf_tc_expect_fail("test fails with clang 7-9 - bug 234040");
 #endif
 
 	for (i = 0; i < __arraycount(x); i++) {
diff --git a/lib/msun/tests/trig_test.c b/lib/msun/tests/trig_test.c
index 483a5e187d50..ba1975721d3f 100644
--- a/lib/msun/tests/trig_test.c
+++ b/lib/msun/tests/trig_test.c
@@ -161,7 +161,7 @@ ATF_TC_BODY(reduction, tc)
 	unsigned i;
 
 #if defined(__amd64__) && defined(__clang__) && __clang_major__ >= 7 && \
-    __FreeBSD_cc_version < 1300002
+    __clang_major__ < 10 && __FreeBSD_cc_version < 1300002
 	atf_tc_expect_fail("test fails with clang 7+ - bug 234040");
 #endif