From 301a9c67aaad103a5fb0cd06d775ded208220f49 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 1 Mar 2016 21:44:08 -0500 Subject: test-libudev: disable monitor mode by default and add to automatic tests --- Makefile.am | 4 +++- src/test/test-libudev.c | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e2d5328c1b..270f09641b 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 5ac513b013..e28de9b37b 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; } -- cgit v1.2.3-54-g00ecf