From adbbaca29c0d0cbbbfb3693379d2593608fe293b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Feb 2022 17:38:19 +0000 Subject: host/start-vm: skip tests if no /sys --- host/start-vm/tests/bridge_add_if.c | 6 ++++-- host/start-vm/tests/bridge_remove_if.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'host/start-vm') diff --git a/host/start-vm/tests/bridge_add_if.c b/host/start-vm/tests/bridge_add_if.c index adc9e59..4ca6809 100644 --- a/host/start-vm/tests/bridge_add_if.c +++ b/host/start-vm/tests/bridge_add_if.c @@ -19,8 +19,10 @@ int main(void) int r, tap; struct stat statbuf; - if (!unshare(CLONE_NEWUSER|CLONE_NEWNET|CLONE_NEWNS)) - assert(!mount("sysfs", "/sys", "sysfs", 0, NULL)); + if (!unshare(CLONE_NEWUSER|CLONE_NEWNET|CLONE_NEWNS)) { + if (mount("sysfs", "/sys", "sysfs", 0, NULL) == -1) + return errno == ENOENT ? 77 : 1; + } tap = tap_open(tap_name, 0); if (tap == -1) diff --git a/host/start-vm/tests/bridge_remove_if.c b/host/start-vm/tests/bridge_remove_if.c index ff66094..5ce61bd 100644 --- a/host/start-vm/tests/bridge_remove_if.c +++ b/host/start-vm/tests/bridge_remove_if.c @@ -19,8 +19,10 @@ int main(void) int r, tap; struct stat statbuf; - if (!unshare(CLONE_NEWUSER|CLONE_NEWNET|CLONE_NEWNS)) - assert(!mount("sysfs", "/sys", "sysfs", 0, NULL)); + if (!unshare(CLONE_NEWUSER|CLONE_NEWNET|CLONE_NEWNS)) { + if (mount("sysfs", "/sys", "sysfs", 0, NULL) == -1) + return errno == ENOENT ? 77 : 1; + } tap = tap_open(tap_name, 0); if (tap == -1) -- cgit 1.4.1