From 73a0eecffa9144a344f61cb03304f9f422378f4e Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Mon, 22 Jan 2024 19:15:00 +0900 Subject: [PATCH] tests: (refactor (test_mkfds, lsfd)) use TS_EXIT_NOTSUPP instead of EXIT_ENOSYS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Suggested by Thomas Weißschuh in #2722. Signed-off-by: Masatake YAMATO --- tests/helpers/test_mkfds.c | 14 +++++--------- tests/ts/lsfd/column-ainodeclass | 2 +- tests/ts/lsfd/column-name | 2 +- tests/ts/lsfd/column-type | 2 +- tests/ts/lsfd/lsfd-functions.bash | 1 - tests/ts/lsfd/mkfds-bpf-map | 2 +- tests/ts/lsfd/mkfds-bpf-prog | 2 +- tests/ts/lsfd/mkfds-netns | 2 +- tests/ts/lsfd/mkfds-pidfd | 2 +- 9 files changed, 12 insertions(+), 17 deletions(-) diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c index deaa759e92..78360f7fa5 100644 --- a/tests/helpers/test_mkfds.c +++ b/tests/helpers/test_mkfds.c @@ -20,6 +20,7 @@ #include "c.h" #include "xalloc.h" #include "test_mkfds.h" +#include "exitcodes.h" #include #include @@ -64,7 +65,6 @@ #include #include -#define EXIT_ENOSYS 17 #define EXIT_EPERM 18 #define EXIT_ENOPROTOOPT 19 #define EXIT_EPROTONOSUPPORT 20 @@ -1171,8 +1171,7 @@ static void *make_pidfd(const struct factory *factory, struct fdesc fdescs[], int fd = pidfd_open(pid, 0); if (fd < 0) - err((errno == ENOSYS? EXIT_ENOSYS: EXIT_FAILURE), - "failed in pidfd_open(%d)", (int)pid); + err_nosys(EXIT_FAILURE, "failed in pidfd_open(%d)", (int)pid); free_arg(&target_pid); if (fd != fdescs[0].fd) { @@ -2235,8 +2234,7 @@ static void *make_netns(const struct factory *factory _U_, struct fdesc fdescs[] int ns = ioctl(sd, SIOCGSKNS); if (ns < 0) - err((errno == ENOSYS? EXIT_ENOSYS: EXIT_FAILURE), - "failed in ioctl(SIOCGSKNS)"); + err_nosys(EXIT_FAILURE, "failed in ioctl(SIOCGSKNS)"); close(sd); if (ns != fdescs[0].fd) { @@ -2942,8 +2940,7 @@ static void *make_bpf_prog(const struct factory *factory, struct fdesc fdescs[], bfd = syscall(SYS_bpf, BPF_PROG_LOAD, &attr, sizeof(attr)); if (bfd < 0) - err((errno == ENOSYS? EXIT_ENOSYS: EXIT_FAILURE), - "failed in bpf(BPF_PROG_LOAD)"); + err_nosys(EXIT_FAILURE, "failed in bpf(BPF_PROG_LOAD)"); if (bfd != fdescs[0].fd) { if (dup2(bfd, fdescs[0].fd) < 0) { @@ -3044,8 +3041,7 @@ static void *make_bpf_map(const struct factory *factory, struct fdesc fdescs[], bfd = syscall(SYS_bpf, BPF_MAP_CREATE, &attr, sizeof(attr)); if (bfd < 0) - err((errno == ENOSYS? EXIT_ENOSYS: EXIT_FAILURE), - "failed in bpf(BPF_MAP_CREATE)"); + err_nosys(EXIT_FAILURE, "failed in bpf(BPF_MAP_CREATE)"); if (bfd != fdescs[0].fd) { if (dup2(bfd, fdescs[0].fd) < 0) { diff --git a/tests/ts/lsfd/column-ainodeclass b/tests/ts/lsfd/column-ainodeclass index 3a10026c21..6829494f0e 100755 --- a/tests/ts/lsfd/column-ainodeclass +++ b/tests/ts/lsfd/column-ainodeclass @@ -42,7 +42,7 @@ for C in pidfd inotify; do fi wait "${MKFDS_PID}" } > "$TS_OUTPUT" 2>&1 - if [ "$C-$?" == "pidfd-$ENOSYS" ]; then + if [ "$C-$?" == "pidfd-$TS_EXIT_NOTSUPP" ]; then ts_skip_subtest "pidfd_open(2) is not available" continue fi diff --git a/tests/ts/lsfd/column-name b/tests/ts/lsfd/column-name index a9d46879ad..8bf8f42178 100755 --- a/tests/ts/lsfd/column-name +++ b/tests/ts/lsfd/column-name @@ -64,7 +64,7 @@ for C in ro-regular-file pidfd socketpair; do fi } > "$TS_OUTPUT" 2>&1 wait "${MKFDS_PID}" - if [ "$C-$?" == "pidfd-$ENOSYS" ]; then + if [ "$C-$?" == "pidfd-$TS_EXIT_NOTSUPP" ]; then ts_skip_subtest "pidfd_open(2) is not available" continue fi diff --git a/tests/ts/lsfd/column-type b/tests/ts/lsfd/column-type index 8ededd44f3..77bc5c9400 100755 --- a/tests/ts/lsfd/column-type +++ b/tests/ts/lsfd/column-type @@ -50,7 +50,7 @@ for C in ro-regular-file pidfd inotify socketpair; do fi wait "${MKFDS_PID}" } > "$TS_OUTPUT" 2>&1 - if [ "$C-$?" == "pidfd-$ENOSYS" ]; then + if [ "$C-$?" == "pidfd-$TS_EXIT_NOTSUPP" ]; then ts_skip_subtest "pidfd_open(2) is not available" continue fi diff --git a/tests/ts/lsfd/lsfd-functions.bash b/tests/ts/lsfd/lsfd-functions.bash index d9a35956d8..076ead29f3 100644 --- a/tests/ts/lsfd/lsfd-functions.bash +++ b/tests/ts/lsfd/lsfd-functions.bash @@ -16,7 +16,6 @@ # # The exit-status used in a test target. -readonly ENOSYS=17 readonly EPERM=18 readonly ENOPROTOOPT=19 readonly EPROTONOSUPPORT=20 diff --git a/tests/ts/lsfd/mkfds-bpf-map b/tests/ts/lsfd/mkfds-bpf-map index 0782ef0435..7821fe5062 100755 --- a/tests/ts/lsfd/mkfds-bpf-map +++ b/tests/ts/lsfd/mkfds-bpf-map @@ -42,7 +42,7 @@ NAME=mkfds_map wait "${MKFDS_PID}" } > "$TS_OUTPUT" 2>&1 -if [ "$?" == "$ENOSYS" ]; then +if [ "$?" == "$TS_EXIT_NOTSUPP" ]; then ts_skip "bpf(2) is not available" fi diff --git a/tests/ts/lsfd/mkfds-bpf-prog b/tests/ts/lsfd/mkfds-bpf-prog index c26843fac0..b2a7275f66 100755 --- a/tests/ts/lsfd/mkfds-bpf-prog +++ b/tests/ts/lsfd/mkfds-bpf-prog @@ -42,7 +42,7 @@ NAME=mkdfs_prog wait "${MKFDS_PID}" } > "$TS_OUTPUT" 2>&1 -if [ "$?" == "$ENOSYS" ]; then +if [ "$?" == "$TS_EXIT_NOTSUPP" ]; then ts_skip "bpf(2) is not available" fi diff --git a/tests/ts/lsfd/mkfds-netns b/tests/ts/lsfd/mkfds-netns index 3666879786..df11c95f30 100755 --- a/tests/ts/lsfd/mkfds-netns +++ b/tests/ts/lsfd/mkfds-netns @@ -65,7 +65,7 @@ INO_NS= fi wait "${MKFDS_PID}" } > "$TS_OUTPUT" 2>&1 -if [ "$?" == "$ENOSYS" ]; then +if [ "$?" == "$TS_EXIT_NOTSUPP" ]; then ts_skip "ioctl(fd, SIOCGSKNS) is not available" fi diff --git a/tests/ts/lsfd/mkfds-pidfd b/tests/ts/lsfd/mkfds-pidfd index b5eaef94e9..c0fae4f70a 100755 --- a/tests/ts/lsfd/mkfds-pidfd +++ b/tests/ts/lsfd/mkfds-pidfd @@ -44,7 +44,7 @@ EXPR="(PID != ${TARGET}) and (FD == 3) and (PIDFD.PID == ${TARGET})" fi wait ${MKFDS_PID} } > $TS_OUTPUT 2>&1 -if [ "$?" == "$ENOSYS" ]; then +if [ "$?" == "$TS_EXIT_NOTSUPP" ]; then ts_skip "pidfd_open(2) is not available" fi -- 2.47.3