From: Reagan Bohan <reagan@ourmail.work>
To: igt-dev@lists.freedesktop.org
Cc: Reagan Bohan <reagan@ourmail.work>
Subject: [PATCH i-g-t v2 5/7] tests: use poll.h in includes
Date: Sat, 27 Apr 2024 11:18:43 +0000 [thread overview]
Message-ID: <20240427112045.10987-6-reagan@ourmail.work> (raw)
In-Reply-To: <20240427112045.10987-1-reagan@ourmail.work>
sys/poll.h is non-standard and including it on musl produces a warning.
Signed-off-by: Reagan Bohan <reagan@ourmail.work>
---
tests/amdgpu/amd_prime.c | 2 +-
tests/core_auth.c | 2 +-
tests/drm_read.c | 2 +-
tests/intel/gem_exec_capture.c | 2 +-
tests/intel/gem_exec_fair.c | 2 +-
tests/intel/gem_exec_fence.c | 2 +-
tests/intel/gem_exec_nop.c | 2 +-
tests/intel/gem_exec_schedule.c | 2 +-
tests/intel/gem_wait.c | 2 +-
tests/intel/kms_busy.c | 2 +-
tests/intel/prime_busy.c | 2 +-
tests/intel/xe_dma_buf_sync.c | 2 +-
tests/kms_cursor_legacy.c | 2 +-
tests/kms_flip.c | 2 +-
tests/kms_lease.c | 2 +-
tests/kms_prime.c | 2 +-
tests/kms_sequence.c | 2 +-
tests/kms_vblank.c | 2 +-
tests/prime_vgem.c | 2 +-
tests/testdisplay.c | 2 +-
tests/vgem_basic.c | 2 +-
tests/vgem_slow.c | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/tests/amdgpu/amd_prime.c b/tests/amdgpu/amd_prime.c
index 6916c3173..6bcf11198 100644
--- a/tests/amdgpu/amd_prime.c
+++ b/tests/amdgpu/amd_prime.c
@@ -24,7 +24,7 @@
#include <amdgpu.h>
#include <amdgpu_drm.h>
-#include <sys/poll.h>
+#include <poll.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/core_auth.c b/tests/core_auth.c
index 2d6ad83e9..f4381bba0 100644
--- a/tests/core_auth.c
+++ b/tests/core_auth.c
@@ -34,12 +34,12 @@
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
+#include <poll.h>
#include <sched.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/time.h>
-#include <sys/poll.h>
#include <sys/resource.h>
#include "drm.h"
/**
diff --git a/tests/drm_read.c b/tests/drm_read.c
index 94c53fded..144c2140f 100644
--- a/tests/drm_read.c
+++ b/tests/drm_read.c
@@ -39,10 +39,10 @@
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
+#include <poll.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/time.h>
-#include <sys/poll.h>
#include <pthread.h>
#include "drm.h"
diff --git a/tests/intel/gem_exec_capture.c b/tests/intel/gem_exec_capture.c
index 57b178f3e..3c8660ac5 100644
--- a/tests/intel/gem_exec_capture.c
+++ b/tests/intel/gem_exec_capture.c
@@ -22,8 +22,8 @@
*/
#include <ctype.h>
+#include <poll.h>
#include <sched.h>
-#include <sys/poll.h>
#include <zlib.h>
#include "i915/gem.h"
diff --git a/tests/intel/gem_exec_fair.c b/tests/intel/gem_exec_fair.c
index e71fa2f0d..003cd1c4f 100644
--- a/tests/intel/gem_exec_fair.c
+++ b/tests/intel/gem_exec_fair.c
@@ -5,8 +5,8 @@
#include "config.h"
+#include <poll.h>
#include <pthread.h>
-#include <sys/poll.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/resource.h>
diff --git a/tests/intel/gem_exec_fence.c b/tests/intel/gem_exec_fence.c
index e4263b3f9..28bad83f6 100644
--- a/tests/intel/gem_exec_fence.c
+++ b/tests/intel/gem_exec_fence.c
@@ -21,9 +21,9 @@
* IN THE SOFTWARE.
*/
+#include <poll.h>
#include <string.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <sys/signal.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/intel/gem_exec_nop.c b/tests/intel/gem_exec_nop.c
index 6c547a412..0f1da1a47 100644
--- a/tests/intel/gem_exec_nop.c
+++ b/tests/intel/gem_exec_nop.c
@@ -33,9 +33,9 @@
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
+#include <poll.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <sys/time.h>
#include <time.h>
diff --git a/tests/intel/gem_exec_schedule.c b/tests/intel/gem_exec_schedule.c
index 70243e72b..cae846794 100644
--- a/tests/intel/gem_exec_schedule.c
+++ b/tests/intel/gem_exec_schedule.c
@@ -25,8 +25,8 @@
#include <linux/userfaultfd.h>
+#include <poll.h>
#include <pthread.h>
-#include <sys/poll.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/syscall.h>
diff --git a/tests/intel/gem_wait.c b/tests/intel/gem_wait.c
index fa6eb9f77..149f1ce71 100644
--- a/tests/intel/gem_wait.c
+++ b/tests/intel/gem_wait.c
@@ -25,7 +25,7 @@
*
*/
-#include <sys/poll.h>
+#include <poll.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/intel/kms_busy.c b/tests/intel/kms_busy.c
index 004d9ee6e..db45e286e 100644
--- a/tests/intel/kms_busy.c
+++ b/tests/intel/kms_busy.c
@@ -31,7 +31,7 @@
* Test category: functionality test
*/
-#include <sys/poll.h>
+#include <poll.h>
#include <signal.h>
#include <time.h>
diff --git a/tests/intel/prime_busy.c b/tests/intel/prime_busy.c
index 66af5f8a3..351b16138 100644
--- a/tests/intel/prime_busy.c
+++ b/tests/intel/prime_busy.c
@@ -21,7 +21,7 @@
* IN THE SOFTWARE.
*/
-#include <sys/poll.h>
+#include <poll.h>
#include "i915/gem.h"
#include "i915/gem_create.h"
diff --git a/tests/intel/xe_dma_buf_sync.c b/tests/intel/xe_dma_buf_sync.c
index b69283093..2db576ba8 100644
--- a/tests/intel/xe_dma_buf_sync.c
+++ b/tests/intel/xe_dma_buf_sync.c
@@ -20,7 +20,7 @@
#include "xe/xe_spin.h"
#include <string.h>
#include <linux/dma-buf.h>
-#include <sys/poll.h>
+#include <poll.h>
#define MAX_N_BO 16
#define N_FD 2
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index a430f735a..5b97028c7 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -32,8 +32,8 @@
* Test category: functionality test
*/
+#include <poll.h>
#include <sched.h>
-#include <sys/poll.h>
#include "i915/gem.h"
#include "igt.h"
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 15c3b5ba2..d352ee14c 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -40,9 +40,9 @@
#include <errno.h>
#include <fcntl.h>
#include <math.h>
+#include <poll.h>
#include <stdint.h>
#include <unistd.h>
-#include <sys/poll.h>
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index f7531c803..9e56d8b8b 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -38,8 +38,8 @@
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
+#include <poll.h>
#include <time.h>
-#include <sys/poll.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/tests/kms_prime.c b/tests/kms_prime.c
index 135c75168..0b5dbf06e 100644
--- a/tests/kms_prime.c
+++ b/tests/kms_prime.c
@@ -37,8 +37,8 @@
#include "igt_sysfs.h"
#include <fcntl.h>
+#include <poll.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <time.h>
/**
diff --git a/tests/kms_sequence.c b/tests/kms_sequence.c
index 23867d1aa..bf3cdf821 100644
--- a/tests/kms_sequence.c
+++ b/tests/kms_sequence.c
@@ -40,7 +40,7 @@
#include <inttypes.h>
#include <errno.h>
#include <time.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
index 956ba483a..696bc0b71 100644
--- a/tests/kms_vblank.c
+++ b/tests/kms_vblank.c
@@ -37,8 +37,8 @@
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
+#include <poll.h>
#include <time.h>
-#include <sys/poll.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index fa19d8e64..8f1cf8552 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -21,8 +21,8 @@
* IN THE SOFTWARE.
*/
+#include <poll.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <time.h>
#include "i915/gem.h"
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 109ed496a..e83655fb5 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -64,8 +64,8 @@
#include <stdbool.h>
#include <strings.h>
#include <unistd.h>
+#include <poll.h>
#include <termios.h>
-#include <sys/poll.h>
#include <sys/time.h>
#include <sys/ioctl.h>
#include <sys/types.h>
diff --git a/tests/vgem_basic.c b/tests/vgem_basic.c
index cb92efbf5..6d4b89976 100644
--- a/tests/vgem_basic.c
+++ b/tests/vgem_basic.c
@@ -27,8 +27,8 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
+#include <poll.h>
#include <sys/mman.h>
-#include <sys/poll.h>
#include <sys/stat.h>
#include <dirent.h>
/**
diff --git a/tests/vgem_slow.c b/tests/vgem_slow.c
index 35761a4ee..91c3fc501 100644
--- a/tests/vgem_slow.c
+++ b/tests/vgem_slow.c
@@ -26,8 +26,8 @@
#include "igt_debugfs.h"
#include "igt_sysfs.h"
+#include <poll.h>
#include <sys/mman.h>
-#include <sys/poll.h>
#include <sys/stat.h>
#include <dirent.h>
/**
--
2.43.2
next prev parent reply other threads:[~2024-04-27 11:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-21 23:20 [PATCH 0/3] Misc. musl libc fixes Reagan Bohan
2024-04-21 23:20 ` [PATCH 1/3] Define _LARGEFILE64_SOURCE for musl libc Reagan Bohan
2024-04-22 15:36 ` Kamil Konieczny
2024-04-27 7:11 ` Reagan Bohan
2024-04-21 23:20 ` [PATCH 2/3] Change sys/poll.h to poll.h Reagan Bohan
2024-04-22 15:48 ` Kamil Konieczny
2024-04-27 7:06 ` Reagan Bohan
2024-04-21 23:20 ` [PATCH 3/3] Change sys/signal.h to signal.h Reagan Bohan
2024-04-22 15:49 ` Kamil Konieczny
2024-04-27 11:18 ` [PATCH i-g-t v2 0/7] Misc musl fixes Reagan Bohan
2024-04-27 11:18 ` [PATCH i-g-t v2 1/7] Define _LARGEFILE64_SOURCE for musl libc Reagan Bohan
2024-04-27 11:18 ` [PATCH i-g-t v2 2/7] lib: use poll.h in includes Reagan Bohan
2024-04-27 11:18 ` [PATCH i-g-t v2 3/7] benchmarks: " Reagan Bohan
2024-04-27 11:18 ` [PATCH i-g-t v2 4/7] runner: " Reagan Bohan
2024-04-27 11:18 ` Reagan Bohan [this message]
2024-04-27 11:18 ` [PATCH i-g-t v2 6/7] tools: " Reagan Bohan
2024-04-27 11:18 ` [PATCH i-g-t v2 7/7] Change sys/signal.h to signal.h Reagan Bohan
2024-05-06 16:30 ` [PATCH i-g-t v2 0/7] Misc musl fixes Kamil Konieczny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240427112045.10987-6-reagan@ourmail.work \
--to=reagan@ourmail.work \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox