| Message ID | 20190717134335.15351-20-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next for 4.1-rc2 (win, travis, iotests) | expand |
On 7/17/19 3:43 PM, Alex Bennée wrote: > It's very confusing when things work in the debug shell because the > environment is different from what the test is running. Fix this by > ensuring we only have the inherited environment from the run shell. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/run | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/docker/run b/tests/docker/run > index 7aebf4b5698..1014871fec0 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 > +$SHELL --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 && exit 1 > + $SHELL --noprofile --norc && exit 1 > else > exit 1 > fi > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/tests/docker/run b/tests/docker/run index 7aebf4b5698..1014871fec0 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 +$SHELL --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 && exit 1 + $SHELL --noprofile --norc && exit 1 else exit 1 fi
It's very confusing when things work in the debug shell because the environment is different from what the test is running. Fix this by ensuring we only have the inherited environment from the run shell. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1