[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/45] tests/docker: avoid $SHELL invoke bash directl
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 28/45] tests/docker: avoid $SHELL invoke bash directly |
Date: |
Tue, 10 Sep 2019 09:43:32 +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.
This fixes:
$ make docker-test-build@IMAGE DEBUG=1
[...]
+ echo ' ./test-build'
./test-build
+ echo '* Hit Ctrl-D to continue, or type '\''exit 1'\'' to abort'
* Hit Ctrl-D to continue, or type 'exit 1' to abort
+ echo
+ /bin/sh --noprofile --norc
/bin/sh: 0: Illegal option --
Fixes: 2b0c4fa13f3
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
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
- [Qemu-devel] [PULL 36/45] .travis.yml: Cache Python PIP packages, (continued)
- [Qemu-devel] [PULL 36/45] .travis.yml: Cache Python PIP packages, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 35/45] .travis.yml: Increase cache timeout from 3min to 20min, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 39/45] .travis.yml: Enable ccache on OSX, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 17/45] tests/docker: move our HPPA cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 43/45] .travis.yml: Cache Linux/Clang jobs together, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 40/45] .travis.yml: Document how the build matrix use caches, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 28/45] tests/docker: avoid $SHELL invoke bash directly,
Alex Bennée <=
- Re: [Qemu-devel] [PULL 00/45] testing updates (fixes, upgrades, caching), Peter Maydell, 2019/09/10