Author: ngie
Date: Tue Sep 6 17:22:25 2016
New Revision: 305483
URL: https://svnweb.freebsd.org/changeset/base/305483
Log:
Fix tests/sys/kqueue NetBSD tests on 32-bit platforms by using proper
format specifier for pointers when printing them out with printf(3)
MFC after: 57 days
Pointyhat to: ngie
Reported by: bz, cy, Jenkins (i386 job)
Submitted by: cy
Sponsored by: EMC / Isilon Storage Division
Modified:
head/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
head/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
head/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
head/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
head/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
head/contrib/netbsd-tests/kernel/kqueue/t_sig.c
Modified: head/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
==============================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c Tue Sep 6
17:16:59 2016 (r305482)
+++ head/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c Tue Sep 6
17:22:25 2016 (r305483)
@@ -78,7 +78,11 @@ ATF_TC_BODY(fifo, tc)
RL(n = kevent(kq, NULL, 0, event, 1, NULL));
(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+#ifdef __FreeBSD__
+ "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags,
+#else
"data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+#endif
event[0].fflags, event[0].data);
ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ);
Modified: head/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
==============================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/read/t_file.c Tue Sep 6
17:16:59 2016 (r305482)
+++ head/contrib/netbsd-tests/kernel/kqueue/read/t_file.c Tue Sep 6
17:22:25 2016 (r305483)
@@ -111,7 +111,11 @@ ATF_TC_BODY(file, tc)
num += n;
(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+#ifdef __FreeBSD__
+ "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags,
+#else
"%" PRId64 "\n", n, event[0].flags, event[0].fflags,
+#endif
event[0].data);
if (event[0].data < 0)
Modified: head/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
==============================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c Tue Sep 6
17:16:59 2016 (r305482)
+++ head/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c Tue Sep 6
17:22:25 2016 (r305483)
@@ -67,7 +67,11 @@ ATF_TC_BODY(pipe, tc)
RL(n = kevent(kq, NULL, 0, event, 1, NULL));
(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+#ifdef __FreeBSD__
+ "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags,
event[0].data);
+#else
"%" PRId64 "\n", n, event[0].flags, event[0].fflags, event[0].data);
+#endif
RL(n = read(fds[0], buffer, event[0].data));
buffer[n] = '\0';
Modified: head/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
==============================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c Tue Sep 6
17:16:59 2016 (r305482)
+++ head/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c Tue Sep 6
17:22:25 2016 (r305483)
@@ -103,7 +103,11 @@ h_check(bool check_master)
RL(n = kevent(kq, NULL, 0, event, 1, NULL));
(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+#ifdef __FreeBSD__
+ "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags,
+#else
"data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+#endif
event[0].fflags, event[0].data);
ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ);
Modified: head/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
==============================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/t_proc1.c Tue Sep 6 17:16:59
2016 (r305482)
+++ head/contrib/netbsd-tests/kernel/kqueue/t_proc1.c Tue Sep 6 17:22:25
2016 (r305483)
@@ -139,7 +139,11 @@ ATF_TC_BODY(proc1, tc)
printf(" NOTE_FORK");
}
if (event[0].fflags & NOTE_CHILD)
+#ifdef __FreeBSD__
+ printf(" NOTE_CHILD, parent = %" PRIdPTR,
event[0].data);
+#else
printf(" NOTE_CHILD, parent = %" PRId64, event[0].data);
+#endif
printf("\n");
}
Modified: head/contrib/netbsd-tests/kernel/kqueue/t_sig.c
==============================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/t_sig.c Tue Sep 6 17:16:59
2016 (r305482)
+++ head/contrib/netbsd-tests/kernel/kqueue/t_sig.c Tue Sep 6 17:22:25
2016 (r305483)
@@ -130,7 +130,11 @@ ATF_TC_BODY(sig, tc)
if (n == 0)
continue;
+#ifdef __FreeBSD__
+ (void)printf("sig: kevent flags: 0x%x, data: %" PRIdPTR " (# "
+#else
(void)printf("sig: kevent flags: 0x%x, data: %" PRId64 " (# "
+#endif
"times signal posted)\n", event[0].flags, event[0].data);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
