[PULL,13/28] podman: fix command invocation

Message ID	20190926183553.13895-14-alex.bennee@linaro.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Subject: [PULL 13/28] podman: fix command invocation Date: Thu, 26 Sep 2019 19:35:38 +0100 Message-Id: <20190926183553.13895-14-alex.bennee@linaro.org> In-Reply-To: <20190926183553.13895-1-alex.bennee@linaro.org> References: <20190926183553.13895-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: Fam Zheng <fam@euphon.net>, Thomas Huth <thuth@redhat.com>, John Snow <jsnow@redhat.com>, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= <philmd@redhat.com>, Cleber Rosa <crosa@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	None \| expand [PULL,02/28] target/alpha: Fix SWCR_MAP_UMZ [PULL,03/28] target/alpha: Fix SWCR_TRAP_ENABLE_MASK [PULL,04/28] target/alpha: Handle SWCR_MAP_DMZ earlier [PULL,05/28] target/alpha: Write to fpcr_flush_to_zero once [PULL,06/28] target/alpha: Mask IOV exception with INV for user-only [PULL,07/28] target/alpha: Tidy helper_fp_exc_raise_s [PULL,08/28] target/ppc: fix signal delivery for ppc64abi32 [PULL,09/28] tests/docker: add sanitizers back to clang build [PULL,10/28] tests/docker: fix DOCKER_PARTIAL_IMAGES [PULL,11/28] tests/docker: remove python2.7 from debian9-mxe [PULL,12/28] tests/docker: reduce scary warnings by cleaning up clean up [PULL,13/28] podman: fix command invocation [PULL,14/28] tests/tcg: clean-up some comments after the de-tangling [PULL,15/28] tests/tcg: re-enable linux-test for ppc64abi32 [PULL,16/28] tests/tcg: add float_madds test to multiarch [PULL,17/28] tests/tcg: add generic version of float_convs [PULL,18/28] tests/tcg: add simple record/replay smoke test for aarch64 [PULL,19/28] configure: preserve PKG_CONFIG for subdir builds [PULL,20/28] docs/devel: add "check-tcg" to testing.rst [PULL,21/28] target/i386: Fix broken build with WHPX enabled [PULL,22/28] docker: remove debian8-mxe definitions [PULL,23/28] docker: remove unused debian8 partial image [PULL,24/28] docker: remove 'deprecated' image definitions [PULL,25/28] docker: remove unused debian-ports [PULL,26/28] docker: remove unused debian-sid [PULL,27/28] docker: move tests from python2 to python3 [PULL,28/28] tests/docker: remove debian-powerpc-user-cross

Message ID

20190926183553.13895-14-alex.bennee@linaro.org

State

New

Headers

From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Subject: [PULL 13/28] podman: fix command invocation
Date: Thu, 26 Sep 2019 19:35:38 +0100
Message-Id: <20190926183553.13895-14-alex.bennee@linaro.org>
In-Reply-To: <20190926183553.13895-1-alex.bennee@linaro.org>
References: <20190926183553.13895-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: Fam Zheng <fam@euphon.net>, Thomas Huth <thuth@redhat.com>, John Snow
	<jsnow@redhat.com>, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu?=
	=?utf-8?q?-Daud=C3=A9?= <philmd@redhat.com>,
	Cleber Rosa <crosa@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

None | expand

Commit Message

Alex Bennée Sept. 26, 2019, 6:35 p.m. UTC

From: John Snow <jsnow@redhat.com>

Oops; there's no argv here.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20190913193821.17756-1-jsnow@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 3112892fdf..31d8adf836 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -332,7 +332,7 @@  class Docker(object):
             cmd = [ "-u", str(uid) ] + cmd
             # podman requires a bit more fiddling
             if self._command[0] == "podman":
-                argv.insert(0, '--userns=keep-id')
+                cmd.insert(0, '--userns=keep-id')
 
         ret = self._do_check(["run", "--label",
                              "com.qemu.instance.uuid=" + label] + cmd,

[PULL,13/28] podman: fix command invocation

Commit Message

Patch