tests: move signal-util related tests to test-signal-util.c

diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 3083501ce928cd64c15f38268ae3609bcc5f428c..671eb869cb9f9e3da9ab00530fbbde56b19b2b0b 100644 (file)
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -17,6 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <signal.h>
+#include <unistd.h>
+
+#include "macro.h"
 #include "signal-util.h"
 
 static void test_block_signals(void) {
@@ -44,6 +48,20 @@ static void test_block_signals(void) {
         assert_se(sigismember(&ss, SIGVTALRM) == 0);
 }
 
+static void test_ignore_signals(void) {
+        assert_se(ignore_signals(SIGINT, -1) >= 0);
+        assert_se(kill(getpid(), SIGINT) >= 0);
+        assert_se(ignore_signals(SIGUSR1, SIGUSR2, SIGTERM, SIGPIPE, -1) >= 0);
+        assert_se(kill(getpid(), SIGUSR1) >= 0);
+        assert_se(kill(getpid(), SIGUSR2) >= 0);
+        assert_se(kill(getpid(), SIGTERM) >= 0);
+        assert_se(kill(getpid(), SIGPIPE) >= 0);
+        assert_se(default_signals(SIGINT, SIGUSR1, SIGUSR2, SIGTERM, SIGPIPE, -1) >= 0);
+}
+
 int main(int argc, char *argv[]) {
         test_block_signals();
+        test_ignore_signals();
+
+        return 0;
 }

diff --git a/src/test/test-util.c b/src/test/test-util.c
index 239064ed73c056e5cb99a03774d829d4d915416a..60ed7f9aa0320608caa5b10f11155eaebda9611b 100644 (file)
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -42,7 +41,6 @@
 #include "proc-cmdline.h"
 #include "process-util.h"
 #include "rm-rf.h"
-#include "signal-util.h"
 #include "special.h"
 #include "stat-util.h"
 #include "string-util.h"
@@ -445,17 +443,6 @@ static void test_readlink_and_make_absolute(void) {
         assert_se(rm_rf(tempdir, REMOVE_ROOT|REMOVE_PHYSICAL) >= 0);
 }
 
-static void test_ignore_signals(void) {
-        assert_se(ignore_signals(SIGINT, -1) >= 0);
-        assert_se(kill(getpid(), SIGINT) >= 0);
-        assert_se(ignore_signals(SIGUSR1, SIGUSR2, SIGTERM, SIGPIPE, -1) >= 0);
-        assert_se(kill(getpid(), SIGUSR1) >= 0);
-        assert_se(kill(getpid(), SIGUSR2) >= 0);
-        assert_se(kill(getpid(), SIGTERM) >= 0);
-        assert_se(kill(getpid(), SIGPIPE) >= 0);
-        assert_se(default_signals(SIGINT, SIGUSR1, SIGUSR2, SIGTERM, SIGPIPE, -1) >= 0);
-}
-
 static void test_is_symlink(void) {
         char name[] = "/tmp/test-is_symlink.XXXXXX";
         char name_link[] = "/tmp/test-is_symlink.link";
@@ -816,7 +803,6 @@ int main(int argc, char *argv[]) {
         test_close_nointr();
         test_unlink_noerrno();
         test_readlink_and_make_absolute();
-        test_ignore_signals();
         test_is_symlink();
         test_search_and_fopen();
         test_search_and_fopen_nulstr();