diff options
| author | Alex Bennée | 2019-08-14 11:54:26 +0200 |
|---|---|---|
| committer | Alex Bennée | 2019-09-10 15:14:31 +0200 |
| commit | bf5b512cd416b165a677e47229f8968b461b9004 (patch) | |
| tree | 590015ff8f61c529323e2255bd714b905fda3ba1 | |
| parent | tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES (diff) | |
| download | qemu-bf5b512cd416b165a677e47229f8968b461b9004.tar.gz qemu-bf5b512cd416b165a677e47229f8968b461b9004.tar.xz qemu-bf5b512cd416b165a677e47229f8968b461b9004.zip | |
tests/docker: avoid $SHELL invoke bash directly
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 <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
| -rwxr-xr-x | tests/docker/run | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/docker/run b/tests/docker/run index 1014871fec..8edc7026ee 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 |