SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: port udev-test to log_*_errno (#3015)

Browse Source 
SYSTEMD_LOG_LEVEL=debug test/udev-test.pl is working now
Also, fixes CID 1354602
This commit is contained in:
Evgeny Vereshchagin
2016-04-11 21:31:57 +02:00
committed by Martin Pitt
parent 70a399c43a
commit dbab702a2a
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-udev.c
+13 -20
View File
@@ -27,6 +27,7 @@
#include <unistd.h>
#include "fs-util.h"
#include "log.h"
#include "missing.h"
#include "selinux-util.h"
#include "signal-util.h"
@@ -48,33 +49,22 @@ static int fake_filesystems(void) {
{ "test/run", UDEVLIBEXECDIR "/rules.d", "failed to mount empty " UDEVLIBEXECDIR "/rules.d", true },
};
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 (unshare(CLONE_NEWNS) < 0)
return log_error_errno(errno, "failed to call unshare(): %m");
if (mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0) {
err = -errno;
fprintf(stderr, "failed to mount / as private: %m\n");
goto out;
}
if (mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0)
return log_error_errno(errno, "failed to mount / as private: %m");
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%s\n", fakefss[i].error, fakefss[i].ignore_mount_error ? ", ignoring" : "");
if (mount(fakefss[i].src, fakefss[i].target, NULL, MS_BIND, NULL) < 0) {
log_full_errno(fakefss[i].ignore_mount_error ? LOG_DEBUG : LOG_ERR, errno, "%s: %m", fakefss[i].error);
if (!fakefss[i].ignore_mount_error)
return err;
err = 0;
return -errno;
}
}
out:
return err;
return 0;
}
int main(int argc, char *argv[]) {
@@ -87,6 +77,9 @@ int main(int argc, char *argv[]) {
const char *action;
int err;
log_parse_environment();
log_open();
err = fake_filesystems();
if (err < 0)
return EXIT_FAILURE;