From: Alexey Bogdanenko <alexey@bogdanenko.com>
Date: Tue, 11 Dec 2018 13:55:34 +0000 (+0300)
Subject: udev-test: add message to show why test-udev failed
X-Git-Tag: v240~87^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a680beb2fe912aadcddd3855d130e10a36e574d7;p=thirdparty%2Fsystemd.git

udev-test: add message to show why test-udev failed

Before:

    Assertion 'mknod(devname, mode, devnum) == 0' failed at ../src/test/test-udev.c:116, function run(). Aborting.
    Assertion 'unlink(devname) == 0' failed at ../src/test/test-udev.c:118, function run(). Aborting.

After:

    mknod() failed for '/dev/sda': Operation not permitted
    unlink('/dev/sda') failed: No such file or directory
---

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index b5d3eb7bc45..281dbb51f29 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -113,9 +113,11 @@ static int run(int argc, char *argv[]) {
 
                         (void) mkdir_parents_label(devname, 0755);
                         (void) sd_device_get_devnum(dev, &devnum);
-                        assert_se(mknod(devname, mode, devnum) == 0);
+                        if (mknod(devname, mode, devnum) < 0)
+                                return log_error_errno(errno, "mknod() failed for '%s': %m", devname);
                 } else {
-                        assert_se(unlink(devname) == 0);
+                        if (unlink(devname) < 0)
+                                return log_error_errno(errno, "unlink('%s') failed: %m", devname);
                         (void) rmdir_parents(devname, "/");
                 }
         }