svn commit: r313381 - in projects/netbsd-tests-upstream-01-2017: contrib/netbsd-tests/lib/libc/gen lib/libc/stdlib lib/libc/tests/stdio sys/dev/ath
Ngie Cooper
ngie at FreeBSD.org
Tue Feb 7 06:04:15 UTC 2017
Author: ngie
Date: Tue Feb 7 06:04:13 2017
New Revision: 313381
URL: https://svnweb.freebsd.org/changeset/base/313381
Log:
MFhead at r313380
Modified:
projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
projects/netbsd-tests-upstream-01-2017/lib/libc/stdlib/hcreate.3
projects/netbsd-tests-upstream-01-2017/lib/libc/tests/stdio/printbasic_test.c
projects/netbsd-tests-upstream-01-2017/lib/libc/tests/stdio/printfloat_test.c
projects/netbsd-tests-upstream-01-2017/sys/dev/ath/if_athvar.h
Directory Properties:
projects/netbsd-tests-upstream-01-2017/ (props changed)
projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/ (props changed)
Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c Tue Feb 7 05:44:13 2017 (r313380)
+++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c Tue Feb 7 06:04:13 2017 (r313381)
@@ -119,6 +119,11 @@ ATF_TC_BODY(floatunditf, tc)
#else
size_t i;
+#if defined(__FreeBSD__) && defined(__i386__)
+ atf_tc_expect_fail("the floating point error on FreeBSD/i386 doesn't "
+ "match the expected floating point error on NetBSD");
+#endif
+
for (i = 0; i < __arraycount(testcases); ++i)
ATF_CHECK_MSG(
testcases[i].ld == (long double)testcases[i].u64,
Modified: projects/netbsd-tests-upstream-01-2017/lib/libc/stdlib/hcreate.3
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/lib/libc/stdlib/hcreate.3 Tue Feb 7 05:44:13 2017 (r313380)
+++ projects/netbsd-tests-upstream-01-2017/lib/libc/stdlib/hcreate.3 Tue Feb 7 06:04:13 2017 (r313381)
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 26, 2015
+.Dd February 6, 2017
.Dt HCREATE 3
.Os
.Sh NAME
@@ -265,9 +265,9 @@ main(void)
.Ed
.Sh ERRORS
The
-.Fn hcreate
+.Fn hcreate ,
.Fn hcreate_r ,
-.Fn hsearch
+.Fn hsearch ,
and
.Fn hsearch_r
functions will fail if:
@@ -281,7 +281,7 @@ The
and
.Fn hsearch_r
functions will also fail if the action is
-.Dv SEARCH
+.Dv FIND
and the element is not found:
.Bl -tag -width Er
.It Bq Er ESRCH
Modified: projects/netbsd-tests-upstream-01-2017/lib/libc/tests/stdio/printbasic_test.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/lib/libc/tests/stdio/printbasic_test.c Tue Feb 7 05:44:13 2017 (r313380)
+++ projects/netbsd-tests-upstream-01-2017/lib/libc/tests/stdio/printbasic_test.c Tue Feb 7 06:04:13 2017 (r313381)
@@ -78,22 +78,19 @@ _testfmt(const char *result, const char
va_copy(ap2, ap);
smash_stack();
vsnprintf(s, sizeof(s), fmt, ap);
- if (strcmp(result, s) != 0) {
- atf_tc_fail(
- "printf(\"%s\", %s) ==> [%s], expected [%s]",
- fmt, argstr, s, result);
- }
+ ATF_CHECK_MSG(strcmp(result, s) == 0,
+ "printf(\"%s\", %s) ==> [%s], expected [%s]",
+ fmt, argstr, s, result);
smash_stack();
mbstowcs(ws, s, BUF - 1);
mbstowcs(wfmt, fmt, BUF - 1);
mbstowcs(wresult, result, BUF - 1);
vswprintf(ws, sizeof(ws) / sizeof(ws[0]), wfmt, ap2);
- if (wcscmp(wresult, ws) != 0) {
- atf_tc_fail(
- "wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]",
- wfmt, argstr, ws, wresult);
- }
+ ATF_CHECK_MSG(wcscmp(wresult, ws) == 0,
+ "wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]",
+ wfmt, argstr, ws, wresult);
+
va_end(ap);
va_end(ap2);
}
@@ -114,6 +111,11 @@ ATF_TC_BODY(int_within_limits, tc)
testfmt("-1", "%jd", (intmax_t)-1);
testfmt(S_UINT64MAX, "%ju", UINT64_MAX);
+ if (sizeof(ptrdiff_t) != sizeof(uintmax_t))
+ atf_tc_expect_fail("the %%t qualifier is broken on 32-bit "
+ "platforms where there's a mismatch between ptrdiff_t and "
+ "uintmax_t's type width; bug # 191674");
+
testfmt("-1", "%td", (ptrdiff_t)-1);
testfmt(S_SIZEMAX, "%tu", (size_t)-1);
Modified: projects/netbsd-tests-upstream-01-2017/lib/libc/tests/stdio/printfloat_test.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/lib/libc/tests/stdio/printfloat_test.c Tue Feb 7 05:44:13 2017 (r313380)
+++ projects/netbsd-tests-upstream-01-2017/lib/libc/tests/stdio/printfloat_test.c Tue Feb 7 06:04:13 2017 (r313381)
@@ -70,22 +70,19 @@ _testfmt(const char *result, const char
va_copy(ap2, ap);
smash_stack();
vsnprintf(s, sizeof(s), fmt, ap);
- if (strcmp(result, s) != 0) {
- atf_tc_fail(
- "printf(\"%s\", %s) ==> [%s], expected [%s]",
- fmt, argstr, s, result);
- }
+ ATF_CHECK_MSG(strcmp(result, s) == 0,
+ "printf(\"%s\", %s) ==> [%s], expected [%s]",
+ fmt, argstr, s, result);
smash_stack();
mbstowcs(ws, s, BUF - 1);
mbstowcs(wfmt, fmt, BUF - 1);
mbstowcs(wresult, result, BUF - 1);
vswprintf(ws, sizeof(ws) / sizeof(ws[0]), wfmt, ap2);
- if (wcscmp(wresult, ws) != 0) {
- atf_tc_fail(
- "wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]",
- wfmt, argstr, ws, wresult);
- }
+ ATF_CHECK_MSG(wcscmp(wresult, ws) == 0,
+ "wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]",
+ wfmt, argstr, ws, wresult);
+
va_end(ap);
va_end(ap2);
}
@@ -318,7 +315,7 @@ ATF_TC_BODY(hexadecimal_floating_point,
testfmt("0x1p-1074", "%a", 0x1p-1074);
testfmt("0x1.2345p-1024", "%a", 0x1.2345p-1024);
-#if (LDBL_MANT_DIG == 64) && !defined(__i386__)
+#if (LDBL_MANT_DIG == 64)
testfmt("0x1.921fb54442d18468p+1", "%La", 0x3.243f6a8885a308dp0L);
testfmt("0x1p-16445", "%La", 0x1p-16445L);
testfmt("0x1.30ecap-16381", "%La", 0x9.8765p-16384L);
Modified: projects/netbsd-tests-upstream-01-2017/sys/dev/ath/if_athvar.h
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/sys/dev/ath/if_athvar.h Tue Feb 7 05:44:13 2017 (r313380)
+++ projects/netbsd-tests-upstream-01-2017/sys/dev/ath/if_athvar.h Tue Feb 7 06:04:13 2017 (r313381)
@@ -490,6 +490,7 @@ struct ath_vap {
int (*av_set_tim)(struct ieee80211_node *, int);
void (*av_recv_pspoll)(struct ieee80211_node *,
struct mbuf *);
+ struct ieee80211_quiet_ie quiet_ie;
};
#define ATH_VAP(vap) ((struct ath_vap *)(vap))
@@ -1484,6 +1485,8 @@ void ath_intr(void *);
((*(_ah)->ah_get11nExtBusy)((_ah)))
#define ath_hal_setchainmasks(_ah, _txchainmask, _rxchainmask) \
((*(_ah)->ah_setChainMasks)((_ah), (_txchainmask), (_rxchainmask)))
+#define ath_hal_set_quiet(_ah, _p, _d, _o, _f) \
+ ((*(_ah)->ah_setQuiet)((_ah), (_p), (_d), (_o), (_f)))
#define ath_hal_spectral_supported(_ah) \
(ath_hal_getcapability(_ah, HAL_CAP_SPECTRAL_SCAN, 0, NULL) == HAL_OK)
More information about the svn-src-projects
mailing list