From 73e31d7ae73c257ef9892bc5d330c1d570ba5366 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Sat, 24 Nov 2012 23:47:06 -0500
Subject: Fix paths: test/udev-test.pl now works under sudo make distcheck

We move the test-udev.c and test-libudev.c from src/test to test.
This corrects the a problem with hard coded relative paths finding
the test/test/sys directory created by test/udev-test.pl.

This commit draws heavily from nvinson patch in

 https://github.com/gentoo/eudev/pull/20

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---
 src/test/test-udev.c | 176 ---------------------------------------------------
 1 file changed, 176 deletions(-)
 delete mode 100644 src/test/test-udev.c

(limited to 'src/test/test-udev.c')

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
deleted file mode 100644
index 8f2aee4a47..0000000000
--- a/src/test/test-udev.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/***
-  This file is part of systemd.
-
-  Copyright 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
-  Copyright 2004-2012 Kay Sievers <kay@vrfy.org>
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <errno.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <grp.h>
-#include <sched.h>
-#include <sys/mount.h>
-#include <sys/signalfd.h>
-
-#include "udev.h"
-
-#ifndef HAVE_UNSHARE
-#include <sys/syscall.h>
-/* Provide our own replacement with local reach*/
-static inline int unshare (int x) { return syscall(SYS_unshare, x); }
-#endif
-
-void udev_main_log(struct udev *udev, int priority,
-                   const char *file, int line, const char *fn,
-                   const char *format, va_list args) {}
-
-static int fake_filesystems(void) {
-        static const struct fakefs {
-                const char *src;
-                const char *target;
-                const char *error;
-        } fakefss[] = {
-                { "test/sys", "/sys",                   "failed to mount test /sys" },
-                { "test/dev", "/dev",                   "failed to mount test /dev" },
-                { "test/run", "/run",                   "failed to mount test /run" },
-                { "test/run", "/etc/udev/rules.d",      "failed to mount empty /etc/udev/rules.d" },
-                { "test/run", "/usr/lib/udev/rules.d",  "failed to mount empty /usr/lib/udev/rules.d" },
-        };
-        unsigned int i;
-        int err;
-
-        err = unshare(CLONE_NEWNS);
-        if (err < 0) {
-                err = -errno;
-                fprintf(stderr, "failed to call unshare(): %m\n");
-                goto out;
-        }
-
-        if (mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0) {
-                err = -errno;
-                fprintf(stderr, "failed to mount / as private: %m\n");
-                goto out;
-        }
-
-        for (i = 0; i < ELEMENTSOF(fakefss); i++) {
-                err = mount(fakefss[i].src, fakefss[i].target, NULL, MS_BIND, NULL);
-                if (err < 0) {
-                        err = -errno;
-                        fprintf(stderr, "%s %m", fakefss[i].error);
-                        return err;
-                }
-        }
-out:
-        return err;
-}
-
-
-int main(int argc, char *argv[])
-{
-        struct udev *udev;
-        struct udev_event *event = NULL;
-        struct udev_device *dev = NULL;
-        struct udev_rules *rules = NULL;
-        char syspath[UTIL_PATH_SIZE];
-        const char *devpath;
-        const char *action;
-        sigset_t mask, sigmask_orig;
-        int err;
-
-        err = fake_filesystems();
-        if (err < 0)
-                return EXIT_FAILURE;
-
-        udev = udev_new();
-        if (udev == NULL)
-                exit(EXIT_FAILURE);
-        log_debug("version %i\n", VERSION);
-        label_init("/dev");
-
-        sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
-
-        action = argv[1];
-        if (action == NULL) {
-                log_error("action missing\n");
-                goto out;
-        }
-
-        devpath = argv[2];
-        if (devpath == NULL) {
-                log_error("devpath missing\n");
-                goto out;
-        }
-
-        rules = udev_rules_new(udev, 1);
-
-        util_strscpyl(syspath, sizeof(syspath), "/sys", devpath, NULL);
-        dev = udev_device_new_from_syspath(udev, syspath);
-        if (dev == NULL) {
-                log_debug("unknown device '%s'\n", devpath);
-                goto out;
-        }
-
-        udev_device_set_action(dev, action);
-        event = udev_event_new(dev);
-
-        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) {
-                mode_t mode = 0600;
-
-                if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
-                        mode |= S_IFBLK;
-                else
-                        mode |= S_IFCHR;
-
-                if (strcmp(action, "remove") != 0) {
-                        mkdir_parents_label(udev_device_get_devnode(dev), 0755);
-                        mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev));
-                } else {
-                        unlink(udev_device_get_devnode(dev));
-                        util_delete_path(udev, udev_device_get_devnode(dev));
-                }
-        }
-
-        err = udev_event_execute_rules(event, rules, &sigmask_orig);
-        if (err == 0)
-                udev_event_execute_run(event, NULL);
-out:
-        if (event != NULL && event->fd_signal >= 0)
-                close(event->fd_signal);
-        udev_event_unref(event);
-        udev_device_unref(dev);
-        udev_rules_unref(rules);
-        label_finish();
-        udev_unref(udev);
-        if (err != 0)
-                return EXIT_FAILURE;
-        return EXIT_SUCCESS;
-}
-- 
cgit v1.2.3-54-g00ecf