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

Merge pull request 3821 from davide125/fix-tests

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-07-31 22:06:09 -04:00
parent 6d1e2ddd59 4dd4cb8fe4
commit ce5fcc695e
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/udev-test.pl
+9 -2
View File
@@ -1535,11 +1535,18 @@ if (!($<==0)) {
exit($EXIT_TEST_SKIP);
}
# skip the test when running in a chroot
system("systemd-detect-virt", "-r", "-q");
if ($? >> 8 == 0) {
print "Running in a chroot, skipping the test.\n";
exit($EXIT_TEST_SKIP);
}
# skip the test when running in a container
system("systemd-detect-virt", "-c", "-q");
if ($? >> 8 == 0) {
print "Running in a container, skipping the test.\n";
exit($EXIT_TEST_SKIP);
print "Running in a container, skipping the test.\n";
exit($EXIT_TEST_SKIP);
}
udev_setup();