Skip to content

Commit 38d1da0

Browse files
committed
lib/msun/tests: remove newlines in ATF msgs
This fixes broken test reports with the following message: lib/msun/fe_round_test:fe_round -> broken: Test result contains multiple lines: expected_failure: https://bugs.freebsd.org/TODO: /home/siva/src/fbsdsrcgit/contrib/netbsd-tests/lib/libm/t_fe_round.c:95: Didn't get the same rounding mode out!<<NEWLINE>>(index 0) fed in 64 rounding mode, got 0 out<<NEWLINE>> [0.079s] Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
1 parent 1f82d51 commit 38d1da0

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

contrib/netbsd-tests/lib/libm/t_fe_round.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ ATF_TC_BODY(fe_round, tc)
8080
received = lrint(values[i].input);
8181
ATF_CHECK_MSG(
8282
(labs(received - values[i].expected) < EPSILON),
83-
"lrint rounding wrong, difference too large\n"
84-
"input: %f (index %d): got %ld, expected %ld\n",
83+
"lrint rounding wrong, difference too large. "
84+
"input: %f (index %d): got %ld, expected %ld",
8585
values[i].input, i, received, values[i].expected);
8686

8787
/* Do we get the same rounding mode out? */
8888
ATF_CHECK_MSG(
8989
(fegetround() == values[i].round_mode),
90-
"Didn't get the same rounding mode out!\n"
91-
"(index %d) fed in %d rounding mode, got %d out\n",
90+
"Didn't get the same rounding mode out!. "
91+
"(index %d) fed in %d rounding mode, got %d out",
9292
i, values[i].round_mode, fegetround());
9393
}
9494
}
@@ -109,15 +109,15 @@ ATF_TC_BODY(fe_nearbyint, tc)
109109
received = nearbyint(values[i].input);
110110
ATF_CHECK_MSG(
111111
(fabs(received - values[i].expected) < EPSILON),
112-
"nearbyint rounding wrong, difference too large\n"
113-
"input: %f (index %d): got %f, expected %ld\n",
112+
"nearbyint rounding wrong, difference too large. "
113+
"input: %f (index %d): got %f, expected %ld",
114114
values[i].input, i, received, values[i].expected);
115115

116116
/* Do we get the same rounding mode out? */
117117
ATF_CHECK_MSG(
118118
(fegetround() == values[i].round_mode),
119-
"Didn't get the same rounding mode out!\n"
120-
"(index %d) fed in %d rounding mode, got %d out\n",
119+
"Didn't get the same rounding mode out! "
120+
"(index %d) fed in %d rounding mode, got %d out",
121121
i, values[i].round_mode, fegetround());
122122
}
123123
}
@@ -151,8 +151,8 @@ ATF_TC_BODY(fe_nextafter, tc)
151151
}
152152
ATF_CHECK_MSG(
153153
res && (fabs(received - values2[i].expected) < EPSILON),
154-
"nextafter() rounding wrong, difference too large\n"
155-
"input: %f (index %d): got %f, expected %f, res %d\n",
154+
"nextafter() rounding wrong, difference too large. "
155+
"input: %f (index %d): got %f, expected %f, res %d",
156156
values2[i].input, i, received, values2[i].expected, res);
157157
}
158158
}
@@ -177,8 +177,8 @@ ATF_TC_BODY(fe_nexttoward, tc)
177177
}
178178
ATF_CHECK_MSG(
179179
res && (fabs(received - values2[i].expected) < EPSILON),
180-
"nexttoward() rounding wrong, difference too large\n"
181-
"input: %f (index %d): got %f, expected %f, res %d\n",
180+
"nexttoward() rounding wrong, difference too large. "
181+
"input: %f (index %d): got %f, expected %f, res %d",
182182
values2[i].input, i, received, values2[i].expected, res);
183183
}
184184
}

lib/msun/tests/fmaxmin_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
CHECK_FP_EXCEPTIONS_MSG(0, ALL_STD_EXCEPT, \
5151
#func "(%.20Lg, %.20Lg) rmode%d", (x), (y), rmode); \
5252
ATF_CHECK_MSG(fpequal_cs(__result, (expected), true), \
53-
#func "(%.20Lg, %.20Lg) rmode%d = %.20Lg, expected %.20Lg\n", \
53+
#func "(%.20Lg, %.20Lg) rmode%d = %.20Lg, expected %.20Lg", \
5454
(x), (y), rmode, __result, (expected)); \
5555
} while (0)
5656

0 commit comments

Comments
 (0)