From 18b69f73fd97092bfe40e75a7c08b2dc6213d537 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 29 Jan 2019 14:35:13 +0000
Subject: [PATCH] CapsuleTest: Tolerate bwrap not being installed at all

IPC::Run::run dies if the executable can't be found, but returns false
if the executable exists and exits nonzero, so use env(1) instead of
bwrap(1) as the executable.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 tests/CapsuleTest.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CapsuleTest.pm b/tests/CapsuleTest.pm
index 236d44d26..4d2893136 100644
--- a/tests/CapsuleTest.pm
+++ b/tests/CapsuleTest.pm
@@ -275,7 +275,7 @@ skipped (as if via C<plan skip_all =E<gt> ...>), and exit.
 
 sub skip_all_unless_bwrap {
     if (! run([qw(
-                bwrap --ro-bind / / --unshare-ipc --unshare-net
+                env bwrap --ro-bind / / --unshare-ipc --unshare-net
                 --unshare-pid --unshare-user --unshare-uts true
             )], '>&2')) {
         plan(skip_all => 'Cannot run bwrap');
-- 
GitLab