summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2019-08-14 10:54:26 +0100
committerAlex Bennée <alex.bennee@linaro.org>2019-09-10 14:14:31 +0100
commitbf5b512cd416b165a677e47229f8968b461b9004 (patch)
tree590015ff8f61c529323e2255bd714b905fda3ba1
parent44d5a8bf5d2fcb0e7ba8bf990846401e216d00e5 (diff)
downloadfocaccia-qemu-bf5b512cd416b165a677e47229f8968b461b9004.tar.gz
focaccia-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-xtests/docker/run4
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