From 884e1e930b02c3676b3e196fcb3e6bf09162cb53 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Sun, 31 Jul 2016 22:59:25 +0000
Subject: [PATCH] signalfd4.test: rewrite from match_grep to match_diff

* tests/signalfd4.c (get_sigset_size): New function.
(main): Use it.  Print expected output.
* tests/signalfd4.test: Use run_strace_match_diff.
* tests/signalfd4.expected: Remove.
* tests/Makefile.am (EXTRA_DIST): Remove it.
---
 tests/Makefile.am        |  1 -
 tests/signalfd4.c        | 46 +++++++++++++++++++++++++++++++++++-----
 tests/signalfd4.expected |  1 -
 tests/signalfd4.test     |  9 ++------
 4 files changed, 43 insertions(+), 14 deletions(-)
 delete mode 100644 tests/signalfd4.expected

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e3dd4ec0..69dd16a3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -750,7 +750,6 @@ EXTRA_DIST = init.sh run.sh match.awk \
 	     setugid.c \
 	     sigaction.awk \
 	     sigaltstack.expected \
-	     signalfd4.expected \
 	     sockname.c \
 	     statfs.expected \
 	     statx.sh \
diff --git a/tests/signalfd4.c b/tests/signalfd4.c
index 7b1d6ce2..bbd67116 100644
--- a/tests/signalfd4.c
+++ b/tests/signalfd4.c
@@ -1,4 +1,6 @@
 /*
+ * Check decoding of signalfd4 syscall.
+ *
  * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
@@ -27,28 +29,62 @@
 
 #include "tests.h"
 #include <fcntl.h>
+#include <sys/syscall.h>
 
-#if defined HAVE_SYS_SIGNALFD_H && defined HAVE_SIGNALFD && defined O_CLOEXEC
+#if defined __NR_rt_sigprocmask \
+ && defined HAVE_SYS_SIGNALFD_H \
+ && defined HAVE_SIGNALFD \
+ && defined O_CLOEXEC
 
 # include <signal.h>
+# include <stdio.h>
 # include <unistd.h>
 # include <sys/signalfd.h>
 
+static unsigned int
+get_sigset_size(void)
+{
+	const unsigned int big_size = 1024 / 8;
+	unsigned int set_size;
+
+	for (set_size = big_size; set_size; set_size >>= 1) {
+		if (!syscall(__NR_rt_sigprocmask, SIG_SETMASK,
+			     NULL, NULL, set_size))
+			break;
+	}
+
+	if (!set_size)
+		perror_msg_and_fail("rt_sigprocmask");
+
+	return set_size;
+}
+
 int
 main(void)
 {
+	const char *const sigs = SIGUSR2 < SIGCHLD ? "USR2 CHLD" : "CHLD USR2";
+	const unsigned int size = get_sigset_size();
+
 	sigset_t mask;
 	sigemptyset(&mask);
 	sigaddset(&mask, SIGUSR2);
 	sigaddset(&mask, SIGCHLD);
-	(void) close(0);
-	if (signalfd(-1, &mask, O_CLOEXEC | O_NONBLOCK))
-		perror_msg_and_skip("signalfd");
+
+	int fd = signalfd(-1, &mask, O_CLOEXEC | O_NONBLOCK);
+	if (fd < 0)
+		printf("signalfd4(-1, [%s], %u, SFD_CLOEXEC|SFD_NONBLOCK)"
+		       " = %d %s (%m)\n", sigs, size, fd, errno2name());
+	else
+		printf("signalfd4(-1, [%s], %u, SFD_CLOEXEC|SFD_NONBLOCK)"
+		       " = %d\n", sigs, size, fd);
+
+	puts("+++ exited with 0 +++");
 	return 0;
 }
 
 #else
 
-SKIP_MAIN_UNDEFINED("HAVE_SYS_SIGNALFD_H && HAVE_SIGNALFD && O_CLOEXEC")
+SKIP_MAIN_UNDEFINED("__NR_rt_sigprocmask && HAVE_SYS_SIGNALFD_H"
+		    " && HAVE_SIGNALFD && O_CLOEXEC")
 
 #endif
diff --git a/tests/signalfd4.expected b/tests/signalfd4.expected
deleted file mode 100644
index 21937bc2..00000000
--- a/tests/signalfd4.expected
+++ /dev/null
@@ -1 +0,0 @@
-signalfd4\(-1, \[(USR2 CHLD|CHLD USR2)\], (4|8|16), SFD_CLOEXEC\|SFD_NONBLOCK\) += 0
diff --git a/tests/signalfd4.test b/tests/signalfd4.test
index dcbfe68d..a615a5bf 100755
--- a/tests/signalfd4.test
+++ b/tests/signalfd4.test
@@ -1,11 +1,6 @@
 #!/bin/sh
 
-# Check signalfd4 syscall decoding.
+# Check decoding of signalfd4 syscall.
 
 . "${srcdir=.}/init.sh"
-
-run_prog
-run_strace -e signalfd4 $args
-match_grep
-
-exit 0
+run_strace_match_diff
-- 
2.40.0