host/start-vm: skip tests if no /dev/net/tun

8 files changed, 8 insertions, 8 deletions

diff --git a/host/start-vm/tests/bridge_add_if.c b/host/start-vm/tests/bridge_add_if.c
index c4b608d..adc9e59 100644
--- a/host/start-vm/tests/bridge_add_if.c
+++ b/host/start-vm/tests/bridge_add_if.c
@@ -24,7 +24,7 @@ int main(void)
 
 	tap = tap_open(tap_name, 0);
 	if (tap == -1)
-		return errno == EPERM ? 77 : 1;
+		return errno == EPERM || errno == ENOENT ? 77 : 1;
 
 	r = snprintf(bridge_name, sizeof bridge_name, "br%d", rand());
 	assert(r > 0 && (size_t)r < sizeof bridge_name);
diff --git a/host/start-vm/tests/bridge_remove_if.c b/host/start-vm/tests/bridge_remove_if.c
index 77e9a2d..ff66094 100644
--- a/host/start-vm/tests/bridge_remove_if.c
+++ b/host/start-vm/tests/bridge_remove_if.c
@@ -24,7 +24,7 @@ int main(void)
 
 	tap = tap_open(tap_name, 0);
 	if (tap == -1)
-		return errno == EPERM ? 77 : 1;
+		return errno == EPERM || errno == ENOENT ? 77 : 1;
 
 	r = snprintf(bridge_name, sizeof bridge_name, "br%d", rand());
 	assert(r > 0 && (size_t)r < sizeof bridge_name);
diff --git a/host/start-vm/tests/if_down.c b/host/start-vm/tests/if_down.c
index c83c70f..9ee71ba 100644
--- a/host/start-vm/tests/if_down.c
+++ b/host/start-vm/tests/if_down.c
@@ -20,7 +20,7 @@ int main(void)
 
 	unshare(CLONE_NEWUSER|CLONE_NEWNET);
 
-	if (tap_open(name, 0) == -1 && errno == EPERM)
+	if (tap_open(name, 0) == -1 && (errno == EPERM || errno == ENOENT))
 		return 77;
 	assert(!if_up(name));
 	assert(!if_down(name));
diff --git a/host/start-vm/tests/if_rename-%d.c b/host/start-vm/tests/if_rename-%d.c
index 20cbda6..e94f7f3 100644
--- a/host/start-vm/tests/if_rename-%d.c
+++ b/host/start-vm/tests/if_rename-%d.c
@@ -14,7 +14,7 @@ int main(void)
 	unshare(CLONE_NEWUSER|CLONE_NEWNET);
 
 	if (tap_open(name, 0) == -1)
-		return errno == EPERM ? 77 : 1;
+		return errno == EPERM || errno == ENOENT ? 77 : 1;
 	assert(if_rename(name, "tap%d") == -1);
 	assert(errno == EINVAL);
 }
diff --git a/host/start-vm/tests/if_rename-name-too-long.c b/host/start-vm/tests/if_rename-name-too-long.c
index 851a1c3..6118cc9 100644
--- a/host/start-vm/tests/if_rename-name-too-long.c
+++ b/host/start-vm/tests/if_rename-name-too-long.c
@@ -17,7 +17,7 @@ int main(void)
 
 	memset(newname, 'a', sizeof newname);
 	if (tap_open(name, 0) == -1)
-		return errno == EPERM ? 77 : 1;
+		return errno == EPERM || errno == ENOENT ? 77 : 1;
 	assert(if_rename(name, newname) == -1);
 	assert(errno == ENAMETOOLONG);
 }
diff --git a/host/start-vm/tests/if_rename.c b/host/start-vm/tests/if_rename.c
index 377f1e1..d4c8314 100644
--- a/host/start-vm/tests/if_rename.c
+++ b/host/start-vm/tests/if_rename.c
@@ -26,7 +26,7 @@ int main(void)
 	r = snprintf(newname, sizeof newname, "_tap%d", rand());
 	assert(r > 0 && (size_t)r < sizeof newname);
 	if ((fd = tap_open(name, 0)) == -1)
-		return errno == EPERM ? 77 : 1;
+		return errno == EPERM || errno == ENOENT ? 77 : 1;
 	assert(!if_rename(name, newname));
 	assert(!ioctl(fd, TUNGETIFF, &ifr));
 	assert(!strcmp(ifr.ifr_name, newname));
diff --git a/host/start-vm/tests/if_up.c b/host/start-vm/tests/if_up.c
index 6d83a1d..5103fd9 100644
--- a/host/start-vm/tests/if_up.c
+++ b/host/start-vm/tests/if_up.c
@@ -20,7 +20,7 @@ int main(void)
 
 	unshare(CLONE_NEWUSER|CLONE_NEWNET);
 
-	if (tap_open(name, 0) == -1 && errno == EPERM)
+	if (tap_open(name, 0) == -1 && (errno == EPERM || errno == ENOENT))
 		return 77;
 	assert(!if_up(name));
 
diff --git a/host/start-vm/tests/tap_open.c b/host/start-vm/tests/tap_open.c
index 19bc145..6a211d6 100644
--- a/host/start-vm/tests/tap_open.c
+++ b/host/start-vm/tests/tap_open.c
@@ -21,7 +21,7 @@ int main(void)
 	unshare(CLONE_NEWUSER|CLONE_NEWNET);
 
 	fd = tap_open(name, 0);
-	if (fd == -1 && errno == EPERM)
+	if (fd == -1 && (errno == EPERM || errno == ENOENT))
 		return 77;
 	assert(!ioctl(fd, TUNGETIFF, &ifr));
 	assert(!strcmp(name, ifr.ifr_name));