test: make the initial copy file error messages more sensible
authorPeter Hutterer <peter.hutterer@who-t.net>
Sun, 14 May 2017 23:02:32 +0000 (09:02 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Sun, 14 May 2017 23:02:32 +0000 (09:02 +1000)
This is most likely the first error message a developer encounters when
running the test suite and the /run/udev/rules.d directory already exists.
Make it more meaningful than the current generic integer comparison failure.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
test/litest.c

index 89fd4f78999f0a53d0686ad92d6aba26030f07da..a099e1fe64db99e037fa0293e73b12772e56866f 100644 (file)
@@ -1132,7 +1132,10 @@ litest_copy_file(const char *dest, const char *src, const char *header)
        litest_assert(file->path);
 
        out = open(dest, O_CREAT|O_WRONLY, 0644);
-       litest_assert_int_gt(out, -1);
+       if (out == -1)
+               litest_abort_msg("Failed to write to file %s (%s)\n",
+                                dest,
+                                strerror(errno));
 
        if (header) {
                length = strlen(header);
@@ -1140,7 +1143,10 @@ litest_copy_file(const char *dest, const char *src, const char *header)
        }
 
        in = open(src, O_RDONLY);
-       litest_assert_int_gt(in, -1);
+       if (in == -1)
+               litest_abort_msg("Failed to open file %s (%s)\n",
+                                src,
+                                strerror(errno));
        /* lazy, just check for error and empty file copy */
        litest_assert_int_gt(sendfile(out, in, NULL, 40960), 0);
        close(out);