Skip to content

Commit 56e8d88

Browse files
FlandiniFlandini
committed
s/EXCEPT/EXCEPTION/g when EXCEPT and EXPECT are both in a macro identifier
1 parent a215bcf commit 56e8d88

18 files changed

+74
-74
lines changed

‎libc/test/UnitTest/FPExceptMatcher.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ class FPExceptCallableMatcher : public Matcher<bool> {
118118

119119
// Matches on the FP exception flag `expected` being *equal* to FP exception
120120
// flag `actual`
121-
#define EXPECT_FP_EXCEPT_EQUAL(expected, actual) \
121+
#define EXPECT_FP_EXCEPTION_EQ(expected, actual) \
122122
EXPECT_THAT((actual), LIBC_NAMESPACE::testing::FPExceptMatcher((expected)))
123123

124-
#define ASSERT_FP_EXCEPT_EQUAL(expected, actual) \
124+
#define ASSERT_FP_EXCEPT_EQ(expected, actual) \
125125
ASSERT_THAT((actual), LIBC_NAMESPACE::testing::FPExceptMatcher((expected)))
126126

127127
#define ASSERT_RAISES_FP_EXCEPT(func) \
@@ -141,14 +141,14 @@ class FPExceptCallableMatcher : public Matcher<bool> {
141141
// ```
142142
// Ensures that fp excepts are cleared before executing `expr_or_statement`
143143
// Checking (expected = 0) should ensure that no exceptions were set
144-
#define EXPECT_FP_EXCEPT(expected, expr_or_statement) \
144+
#define EXPECT_FP_EXCEPTION(expected, expr_or_statement) \
145145
do { \
146146
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); \
147147
expr_or_statement; \
148148
int expected_ = (expected); \
149149
int mask_ = expected_ ? expected_ : FE_ALL_EXCEPT; \
150150
if (math_errhandling & MATH_ERREXCEPT) { \
151-
EXPECT_FP_EXCEPT_EQUAL(expected_, \
151+
EXPECT_FP_EXCEPTION_EQ(expected_, \
152152
LIBC_NAMESPACE::fputil::test_except(mask_)); \
153153
} \
154154
} while (0)

‎libc/test/UnitTest/FPMatcher.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ template <TestCond C, typename T> FPMatcher<T, C> getMatcher(T expectedValue) {
105105
} \
106106
} while (0)
107107

108-
#define EXPECT_FP_EXCEPTION(expected) \
108+
#define EXPECT_FP_EXCEPTION_HAPPENED(expected) \
109109
do { \
110110
if (math_errhandling & MATH_ERREXCEPT) { \
111111
EXPECT_EQ(LIBC_NAMESPACE::fputil::test_except(FE_ALL_EXCEPT) & \
@@ -114,7 +114,7 @@ template <TestCond C, typename T> FPMatcher<T, C> getMatcher(T expectedValue) {
114114
} \
115115
} while (0)
116116

117-
#define ASSERT_FP_EXCEPTION(expected) \
117+
#define ASSERT_FP_EXCEPTION_HAPPENED(expected) \
118118
do { \
119119
if (math_errhandling & MATH_ERREXCEPT) { \
120120
ASSERT_EQ(LIBC_NAMESPACE::fputil::test_except(FE_ALL_EXCEPT) & \
@@ -127,14 +127,14 @@ template <TestCond C, typename T> FPMatcher<T, C> getMatcher(T expectedValue) {
127127
do { \
128128
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); \
129129
EXPECT_FP_EQ(expected_val, actual_val); \
130-
EXPECT_FP_EXCEPTION(expected_except); \
130+
EXPECT_FP_EXCEPTION_HAPPENED(expected_except); \
131131
} while (0)
132132

133133
#define EXPECT_FP_IS_NAN_WITH_EXCEPTION(actual_val, expected_except) \
134134
do { \
135135
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); \
136136
EXPECT_FP_IS_NAN(actual_val); \
137-
EXPECT_FP_EXCEPTION(expected_except); \
137+
EXPECT_FP_EXCEPTION_HAPPENED(expected_except); \
138138
} while (0)
139139

140140
#define FOR_ROUNDING_(rounding_mode, expr_or_statement) \

‎libc/test/UnitTest/FPTest.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,23 @@ struct FPTest : public ErrnoSafeTest, public FEnvSafeTest {
9090
// Ensures that fp excepts and errno are cleared before executing
9191
// `expr_or_statement` Checking (expected_fexn = 0) ensures that no exceptions
9292
// were set
93-
#define EXPECT_ERRNO_FP_EXCEPT(expected_errno, expected_fexn, \
94-
expr_or_statement) \
95-
EXPECT_FP_EXCEPT((expected_fexn), EXPECT_ERRNO((expected_errno), { \
96-
expr_or_statement; \
97-
if (!(math_errhandling & MATH_ERRNO)) \
98-
break; \
99-
}))
93+
#define EXPECT_ERRNO_FP_EXCEPTION(expected_errno, expected_fexn, \
94+
expr_or_statement) \
95+
EXPECT_FP_EXCEPTION((expected_fexn), EXPECT_ERRNO((expected_errno), { \
96+
expr_or_statement; \
97+
if (!(math_errhandling & MATH_ERRNO)) \
98+
break; \
99+
}))
100100

101-
#define EXPECT_NO_ERRNO_FP_EXCEPT(expr_or_statement) \
102-
EXPECT_ERRNO_FP_EXCEPT(0, 0, expr_or_statement)
101+
#define EXPECT_NO_ERRNO_FP_EXCEPTION(expr_or_statement) \
102+
EXPECT_ERRNO_FP_EXCEPTION(0, 0, expr_or_statement)
103103

104-
#define EXPECT_ERRNO_FP_EXCEPT_ALL_ROUNDING(expected_errno, expected_fexn, \
105-
expr_or_statement) \
106-
FOR_ALL_ROUNDING_(EXPECT_ERRNO_FP_EXCEPT((expected_errno), (expected_fexn), \
107-
expr_or_statement))
104+
#define EXPECT_ERRNO_FP_EXCEPTION_ALL_ROUNDING(expected_errno, expected_fexn, \
105+
expr_or_statement) \
106+
FOR_ALL_ROUNDING_(EXPECT_ERRNO_FP_EXCEPTION( \
107+
(expected_errno), (expected_fexn), expr_or_statement))
108108

109-
#define EXPECT_NO_ERRNO_FP_EXCEPT_ALL_ROUNDING(expr_or_statement) \
110-
FOR_ALL_ROUNDING_(EXPECT_NO_ERRNO_FP_EXCEPT(expr_or_statement))
109+
#define EXPECT_NO_ERRNO_FP_EXCEPTION_ALL_ROUNDING(expr_or_statement) \
110+
FOR_ALL_ROUNDING_(EXPECT_NO_ERRNO_FP_EXCEPTION(expr_or_statement))
111111

112112
#endif // LLVM_LIBC_TEST_UNITTEST_FPTEST_H

‎libc/test/src/math/FModTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT); \
2222
EXPECT_FP_EQ(expected, f(x, y)); \
2323
EXPECT_MATH_ERRNO((dom_err) ? EDOM : 0); \
24-
EXPECT_FP_EXCEPTION(expected_exception)
24+
EXPECT_FP_EXCEPTION_HAPPENED(expected_exception)
2525

2626
#define TEST_REGULAR(x, y, expected) TEST_SPECIAL(x, y, expected, false, 0)
2727

‎libc/test/src/math/RoundToIntegerTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class RoundToIntegerTestTemplate
6262
// all math functions using RoundToInteger test:
6363
// https://github.com/llvm/llvm-project/pull/88816
6464
if (expectError) {
65-
ASSERT_FP_EXCEPTION(FE_INVALID);
65+
ASSERT_FP_EXCEPTION_HAPPENED(FE_INVALID);
6666
ASSERT_MATH_ERRNO(EDOM);
6767
}
6868
}

‎libc/test/src/math/atanf_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ TEST_F(LlvmLibcAtanfTest, SpecialNumbers) {
2929
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanf(aNaN));
3030
// TODO: Uncomment these checks later, RoundingMode affects running
3131
// tests in this way https://github.com/llvm/llvm-project/issues/90653.
32-
// EXPECT_FP_EXCEPTION(0);
32+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
3333
EXPECT_MATH_ERRNO(0);
3434

3535
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
3636
EXPECT_FP_EQ_ALL_ROUNDING(0.0f, LIBC_NAMESPACE::atanf(0.0f));
3737
// TODO: Uncomment these checks later, RoundingMode affects running
3838
// tests in this way https://github.com/llvm/llvm-project/issues/90653.
39-
// EXPECT_FP_EXCEPTION(0);
39+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
4040
EXPECT_MATH_ERRNO(0);
4141

4242
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
4343
EXPECT_FP_EQ_ALL_ROUNDING(-0.0f, LIBC_NAMESPACE::atanf(-0.0f));
4444
// TODO: Uncomment these checks later, RoundingMode affects running
4545
// tests in this way https://github.com/llvm/llvm-project/issues/90653.
46-
// EXPECT_FP_EXCEPTION(0);
46+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
4747
EXPECT_MATH_ERRNO(0);
4848
}
4949

‎libc/test/src/math/atanhf_test.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,69 +30,69 @@ TEST_F(LlvmLibcAtanhfTest, SpecialNumbers) {
3030
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanhf(aNaN));
3131
// TODO: Uncomment these checks later, RoundingMode affects running
3232
// tests in this way https://github.com/llvm/llvm-project/issues/90653.
33-
// EXPECT_FP_EXCEPTION(0);
33+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
3434
EXPECT_MATH_ERRNO(0);
3535

3636
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
3737
EXPECT_FP_EQ_ALL_ROUNDING(0.0f, LIBC_NAMESPACE::atanhf(0.0f));
3838
// See above TODO
39-
// EXPECT_FP_EXCEPTION(0);
39+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
4040
EXPECT_MATH_ERRNO(0);
4141

4242
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
4343
EXPECT_FP_EQ_ALL_ROUNDING(-0.0f, LIBC_NAMESPACE::atanhf(-0.0f));
4444
// See above TODO
45-
// EXPECT_FP_EXCEPTION(0);
45+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
4646
EXPECT_MATH_ERRNO(0);
4747

4848
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
4949
EXPECT_FP_EQ_ALL_ROUNDING(inf, LIBC_NAMESPACE::atanhf(1.0f));
5050
// See above TODO
51-
// EXPECT_FP_EXCEPTION(FE_DIVBYZERO);
51+
// EXPECT_FP_EXCEPTION_HAPPENED(FE_DIVBYZERO);
5252
EXPECT_MATH_ERRNO(ERANGE);
5353

5454
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
5555
EXPECT_FP_EQ_ALL_ROUNDING(neg_inf, LIBC_NAMESPACE::atanhf(-1.0f));
5656
// See above TODO
57-
// EXPECT_FP_EXCEPTION(FE_DIVBYZERO);
57+
// EXPECT_FP_EXCEPTION_HAPPENED(FE_DIVBYZERO);
5858
EXPECT_MATH_ERRNO(ERANGE);
5959

6060
auto bt = FPBits(1.0f);
6161
bt.set_uintval(bt.uintval() + 1);
6262

6363
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
6464
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanhf(bt.get_val()));
65-
// EXPECT_FP_EXCEPTION(FE_INVALID);
65+
// EXPECT_FP_EXCEPTION_HAPPENED(FE_INVALID);
6666
EXPECT_MATH_ERRNO(EDOM);
6767

6868
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
6969
bt.set_sign(Sign::NEG);
7070
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanhf(bt.get_val()));
7171
// See above TODO
72-
// EXPECT_FP_EXCEPTION(FE_INVALID);
72+
// EXPECT_FP_EXCEPTION_HAPPENED(FE_INVALID);
7373
EXPECT_MATH_ERRNO(EDOM);
7474

7575
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
7676
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanhf(2.0f));
7777
// See above TODO
78-
// EXPECT_FP_EXCEPTION(FE_INVALID);
78+
// EXPECT_FP_EXCEPTION_HAPPENED(FE_INVALID);
7979
EXPECT_MATH_ERRNO(EDOM);
8080

8181
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
8282
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanhf(-2.0f));
83-
// EXPECT_FP_EXCEPTION(FE_INVALID);
83+
// EXPECT_FP_EXCEPTION_HAPPENED(FE_INVALID);
8484
EXPECT_MATH_ERRNO(EDOM);
8585

8686
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
8787
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanhf(inf));
8888
// See above TODO
89-
// EXPECT_FP_EXCEPTION(FE_INVALID);
89+
// EXPECT_FP_EXCEPTION_HAPPENED(FE_INVALID);
9090
EXPECT_MATH_ERRNO(EDOM);
9191

9292
bt.set_sign(Sign::NEG);
9393
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanhf(neg_inf));
9494
// See above TODO
95-
// EXPECT_FP_EXCEPTION(FE_INVALID);
95+
// EXPECT_FP_EXCEPTION_HAPPENED(FE_INVALID);
9696
EXPECT_MATH_ERRNO(EDOM);
9797
}
9898

‎libc/test/src/math/cosf_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ using LlvmLibcCosfTest = LIBC_NAMESPACE::testing::FPTest<float>;
2424
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
2525

2626
TEST_F(LlvmLibcCosfTest, SpecialNumbers) {
27-
EXPECT_NO_ERRNO_FP_EXCEPT(EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::cosf(aNaN)));
27+
EXPECT_NO_ERRNO_FP_EXCEPTION(EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::cosf(aNaN)));
2828

29-
EXPECT_NO_ERRNO_FP_EXCEPT(EXPECT_FP_EQ(1.0f, LIBC_NAMESPACE::cosf(0.0f)));
29+
EXPECT_NO_ERRNO_FP_EXCEPTION(EXPECT_FP_EQ(1.0f, LIBC_NAMESPACE::cosf(0.0f)));
3030

31-
EXPECT_NO_ERRNO_FP_EXCEPT(EXPECT_FP_EQ(1.0f, LIBC_NAMESPACE::cosf(-0.0f)));
31+
EXPECT_NO_ERRNO_FP_EXCEPTION(EXPECT_FP_EQ(1.0f, LIBC_NAMESPACE::cosf(-0.0f)));
3232

33-
EXPECT_ERRNO_FP_EXCEPT(EDOM, FE_INVALID,
34-
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::cosf(inf)));
33+
EXPECT_ERRNO_FP_EXCEPTION(EDOM, FE_INVALID,
34+
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::cosf(inf)));
3535

36-
EXPECT_ERRNO_FP_EXCEPT(EDOM, FE_INVALID,
37-
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::cosf(neg_inf)));
36+
EXPECT_ERRNO_FP_EXCEPTION(EDOM, FE_INVALID,
37+
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::cosf(neg_inf)));
3838
}
3939

4040
TEST_F(LlvmLibcCosfTest, InFloatRange) {

‎libc/test/src/math/smoke/CanonicalizeTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#define TEST_SPECIAL(x, y, expected, expected_exception) \
2121
EXPECT_EQ(expected, f(&x, &y)); \
22-
EXPECT_FP_EXCEPTION(expected_exception); \
22+
EXPECT_FP_EXCEPTION_HAPPENED(expected_exception); \
2323
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT)
2424

2525
#define TEST_REGULAR(x, y, expected) TEST_SPECIAL(x, y, expected, 0)

‎libc/test/src/math/smoke/FModTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define TEST_SPECIAL(x, y, expected, dom_err, expected_exception) \
2121
EXPECT_FP_EQ(expected, f(x, y)); \
2222
EXPECT_MATH_ERRNO((dom_err) ? EDOM : 0); \
23-
EXPECT_FP_EXCEPTION(expected_exception); \
23+
EXPECT_FP_EXCEPTION_HAPPENED(expected_exception); \
2424
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT)
2525

2626
#define TEST_REGULAR(x, y, expected) TEST_SPECIAL(x, y, expected, false, 0)

‎libc/test/src/math/smoke/NextAfterTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// after new matchers/test fixtures are added
2323
#define ASSERT_FP_EQ_WITH_EXCEPTION(result, expected, expected_exception) \
2424
ASSERT_FP_EQ(result, expected); \
25-
ASSERT_FP_EXCEPTION(expected_exception); \
25+
ASSERT_FP_EXCEPTION_HAPPENED(expected_exception); \
2626
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT)
2727

2828
#define ASSERT_FP_EQ_WITH_UNDERFLOW(result, expected) \

‎libc/test/src/math/smoke/NextTowardTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// after new matchers/test fixtures are added
2424
#define ASSERT_FP_EQ_WITH_EXCEPTION(result, expected, expected_exception) \
2525
ASSERT_FP_EQ(result, expected); \
26-
ASSERT_FP_EXCEPTION(expected_exception); \
26+
ASSERT_FP_EXCEPTION_HAPPENED(expected_exception); \
2727
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT)
2828

2929
#define ASSERT_FP_EQ_WITH_UNDERFLOW(result, expected) \

‎libc/test/src/math/smoke/RoundToIntegerTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class RoundToIntegerTestTemplate
5050
// all math functions using RoundToInteger test:
5151
// https://github.com/llvm/llvm-project/pull/88816
5252
if (expectError) {
53-
ASSERT_FP_EXCEPTION(FE_INVALID);
53+
ASSERT_FP_EXCEPTION_HAPPENED(FE_INVALID);
5454
ASSERT_MATH_ERRNO(EDOM);
5555
}
5656
}

‎libc/test/src/math/smoke/atan2f_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,36 @@ TEST_F(LlvmLibcAtan2fTest, SpecialNumbers) {
2525
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atan2f(aNaN, zero));
2626
// TODO: Uncomment these checks later, RoundingMode affects running
2727
// tests in this way https://github.com/llvm/llvm-project/issues/90653.
28-
// EXPECT_FP_EXCEPTION(0);
28+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
2929
EXPECT_MATH_ERRNO(0);
3030

3131
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
3232
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atan2f(1.0f, aNaN));
3333
// See above TODO
34-
// EXPECT_FP_EXCEPTION(0);
34+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
3535
EXPECT_MATH_ERRNO(0);
3636

3737
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
3838
EXPECT_FP_EQ_ALL_ROUNDING(0.0f, LIBC_NAMESPACE::atan2f(zero, zero));
3939
// See above TODO
40-
// EXPECT_FP_EXCEPTION(0);
40+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
4141
EXPECT_MATH_ERRNO(0);
4242

4343
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
4444
EXPECT_FP_EQ_ALL_ROUNDING(-0.0f, LIBC_NAMESPACE::atan2f(-0.0f, zero));
4545
// See above TODO
46-
// EXPECT_FP_EXCEPTION(0);
46+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
4747
EXPECT_MATH_ERRNO(0);
4848

4949
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
5050
EXPECT_FP_EQ_ALL_ROUNDING(0.0f, LIBC_NAMESPACE::atan2f(1.0f, inf));
5151
// See above TODO
52-
// EXPECT_FP_EXCEPTION(0);
52+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
5353
EXPECT_MATH_ERRNO(0);
5454

5555
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
5656
EXPECT_FP_EQ_ALL_ROUNDING(-0.0f, LIBC_NAMESPACE::atan2f(-1.0f, inf));
5757
// See above TODO
58-
// EXPECT_FP_EXCEPTION(0);
58+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
5959
EXPECT_MATH_ERRNO(0);
6060
}

‎libc/test/src/math/smoke/atanf_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ TEST_F(LlvmLibcAtanfTest, SpecialNumbers) {
2828
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanf(aNaN));
2929
// TODO: Uncomment these checks later, RoundingMode affects running
3030
// tests in this way https://github.com/llvm/llvm-project/issues/90653.
31-
// EXPECT_FP_EXCEPTION(0);
31+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
3232
EXPECT_MATH_ERRNO(0);
3333

3434
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
3535
EXPECT_FP_EQ_ALL_ROUNDING(0.0f, LIBC_NAMESPACE::atanf(0.0f));
3636
// See above TODO
37-
// EXPECT_FP_EXCEPTION(0);
37+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
3838
EXPECT_MATH_ERRNO(0);
3939

4040
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
4141
EXPECT_FP_EQ_ALL_ROUNDING(-0.0f, LIBC_NAMESPACE::atanf(-0.0f));
4242
// See above TODO
43-
// EXPECT_FP_EXCEPTION(0);
43+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
4444
EXPECT_MATH_ERRNO(0);
4545
}

‎libc/test/src/math/smoke/atanhf_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ TEST_F(LlvmLibcAtanhfTest, SpecialNumbers) {
2828
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::atanhf(aNaN));
2929
// TODO: Uncomment these checks later, RoundingMode affects running
3030
// tests in this way https://github.com/llvm/llvm-project/issues/90653.
31-
// EXPECT_FP_EXCEPTION(0);
31+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
3232
EXPECT_MATH_ERRNO(0);
3333

3434
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
3535
EXPECT_FP_EQ_ALL_ROUNDING(0.0f, LIBC_NAMESPACE::atanhf(0.0f));
3636
// See above TODO
37-
// EXPECT_FP_EXCEPTION(0);
37+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
3838
EXPECT_MATH_ERRNO(0);
3939

4040
LIBC_NAMESPACE::fputil::clear_except(FE_ALL_EXCEPT);
4141
EXPECT_FP_EQ_ALL_ROUNDING(-0.0f, LIBC_NAMESPACE::atanhf(-0.0f));
4242
// See above TODO
43-
// EXPECT_FP_EXCEPTION(0);
43+
// EXPECT_FP_EXCEPTION_HAPPENED(0);
4444
EXPECT_MATH_ERRNO(0);
4545

4646
EXPECT_FP_EQ_WITH_EXCEPTION(inf, LIBC_NAMESPACE::atanhf(1.0f), FE_DIVBYZERO);

0 commit comments

Comments
 (0)