[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 25/42] tests/docker: avoid $SHELL invoke bash dir
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 25/42] tests/docker: avoid $SHELL invoke bash directly |
Date: |
Wed, 4 Sep 2019 21:29:56 +0100 |
On some images SHELL is pointing at a limited /bin/sh which doesn't
understand noprofile/norc. Given the run script is running bash just
invoke it directly.
Signed-off-by: Alex Bennée <address@hidden>
---
tests/docker/run | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/docker/run b/tests/docker/run
index 1014871fec0..8edc7026ee3 100755
--- a/tests/docker/run
+++ b/tests/docker/run
@@ -62,7 +62,7 @@ echo "* Prepared to run command:"
echo " $CMD"
echo "* Hit Ctrl-D to continue, or type 'exit 1' to abort"
echo
-$SHELL --noprofile --norc
+env bash --noprofile --norc
if "$CMD"; then
exit 0
@@ -72,7 +72,7 @@ elif test -n "$DEBUG"; then
echo "* Hit Ctrl-D to exit"
echo
# Force error after shell exits
- $SHELL --noprofile --norc && exit 1
+ env bash --noprofile --norc && exit 1
else
exit 1
fi
--
2.20.1
- Re: [Qemu-devel] [PATCH v1 17/42] tests/docker: move our sh4 cross compile to Buster, (continued)
- [Qemu-devel] [PATCH v1 28/42] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 42/42] tests/docker: don't always encoding for subprocess.check_output, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 16/42] tests/docker: move our sparc64 cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 36/42] .travis.yml: Document how the build matrix use caches, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 40/42] Fedora images: use URLs from stable "archives.fedoraproject.org", Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 38/42] .travis.yml: Cache Linux/GCC 'non-debug profile' jobs together, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 39/42] .travis.yml: Cache Linux/Clang jobs together, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 25/42] tests/docker: avoid $SHELL invoke bash directly,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 26/42] tests/docker: add debian-amd64-cross for non-x86 hosts, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 27/42] tests/docker: use --arch-only for installing deps, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 31/42] .travis.yml: Increase cache timeout from 3min to 20min, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 22/42] tests/docker: drop powerpc-user image for QEMU cross builds, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 37/42] .travis.yml: Cache Linux/GCC 'debug profile' jobs together, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 20/42] tests/docker: move our ppc64 cross compile to Buster, Alex Bennée, 2019/09/04