From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 2 Mar 2016 02:44:08 +0000 (-0500)
Subject: test-libudev: disable monitor mode by default and add to automatic tests
X-Git-Tag: v230~283^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=301a9c67aaad103a5fb0cd06d775ded208220f49;p=thirdparty%2Fsystemd.git

test-libudev: disable monitor mode by default and add to automatic tests
---

diff --git a/Makefile.am b/Makefile.am
index e2d5328c1b1..270f09641b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3709,8 +3709,10 @@ endif
 endif
 endif
 
+tests += \
+	test-libudev
+
 manual_tests += \
-	test-libudev \
 	test-udev
 
 test_libudev_SOURCES = \
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 5ac513b0131..e28de9b37b4 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -350,12 +350,14 @@ static void test_hwdb(struct udev *udev, const char *modalias) {
 
 int main(int argc, char *argv[]) {
         _cleanup_udev_unref_ struct udev *udev = NULL;
+        bool arg_monitor = false;
         static const struct option options[] = {
                 { "syspath",   required_argument, NULL, 'p' },
                 { "subsystem", required_argument, NULL, 's' },
                 { "debug",     no_argument,       NULL, 'd' },
                 { "help",      no_argument,       NULL, 'h' },
                 { "version",   no_argument,       NULL, 'V' },
+                { "monitor",   no_argument,       NULL, 'm' },
                 {}
         };
         const char *syspath = "/devices/virtual/mem/null";
@@ -393,6 +395,10 @@ int main(int argc, char *argv[]) {
                         printf("%s\n", VERSION);
                         return EXIT_SUCCESS;
 
+                case 'm':
+                        arg_monitor = true;
+                        break;
+
                 case '?':
                         return EXIT_FAILURE;
 
@@ -420,7 +426,8 @@ int main(int argc, char *argv[]) {
 
         test_hwdb(udev, "usb:v0D50p0011*");
 
-        test_monitor(udev);
+        if (arg_monitor)
+                test_monitor(udev);
 
         return EXIT_SUCCESS;
 }