summaryrefslogtreecommitdiff
path: root/src/test/test-udev.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-05-15 11:35:15 +0200
committerTom Gundersen <teg@jklm.no>2015-05-29 18:52:13 +0200
commit8128f2297da0c2fdd82b3d48f049deb01763f8c8 (patch)
tree4c4f11816d71ad4b7da14ed558b52a8bb4959eb9 /src/test/test-udev.c
parent693d371d30fee1da58365121801445b404416ada (diff)
udevd: event - port spawn_wait() to sd-event
This allows us to drop the special sigterm handling in spawn_wait() as this will now be passed directly to the worker event loop. We now log failing spawend processes at 'warning' level, and timeouts are in terms of CLOCK_BOOTTIME when available, otherwise the behavior is unchanged.
Diffstat (limited to 'src/test/test-udev.c')
-rw-r--r--src/test/test-udev.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 23b7faa939..f3953fe26a 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -120,11 +120,6 @@ int main(int argc, char *argv[]) {
sigfillset(&mask);
sigprocmask(SIG_SETMASK, &mask, &sigmask_orig);
- event->fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
- if (event->fd_signal < 0) {
- fprintf(stderr, "error creating signalfd\n");
- goto out;
- }
/* do what devtmpfs usually provides us */
if (udev_device_get_devnode(dev) != NULL) {
@@ -153,8 +148,6 @@ int main(int argc, char *argv[]) {
3 * USEC_PER_SEC, USEC_PER_SEC,
NULL);
out:
- if (event != NULL && event->fd_signal >= 0)
- close(event->fd_signal);
mac_selinux_finish();
return err ? EXIT_FAILURE : EXIT_SUCCESS;