david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/docker: avoid $SHELL invoke bash directly

Browse Source 
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>
This commit is contained in:
Alex Bennée 2019-08-14 10:54:26 +01:00
parent 44d5a8bf5d
commit bf5b512cd4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/docker/run
View File

@ -62,7 +62,7 @@ echo "* Prepared to run command:"
echo " $CMD" echo " $CMD"
echo "* Hit Ctrl-D to continue, or type 'exit 1' to abort" echo "* Hit Ctrl-D to continue, or type 'exit 1' to abort"
echo echo
$SHELL --noprofile --norc env bash --noprofile --norc
if "$CMD"; then if "$CMD"; then
exit 0 exit 0
@ -72,7 +72,7 @@ elif test -n "$DEBUG"; then
echo "* Hit Ctrl-D to exit" echo "* Hit Ctrl-D to exit"
echo echo
# Force error after shell exits # Force error after shell exits
$SHELL --noprofile --norc && exit 1 env bash --noprofile --norc && exit 1
else else
exit 1 exit 1
fi fi