diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2020-05-27 09:09:37 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2020-05-27 11:32:17 +0200 |
| commit | 449a2443f59709fec2d250b631f15d9c82df6f72 (patch) | |
| tree | 0529df96aecd7d7d7be8ce5c42c321ef3f1a8835 /scripts/repo-install-test.sh | |
| parent | d6d0a45d4bfe6ecb733323b8c464cbd58a87c3ac (diff) | |
repo-install-test: use sh -ex
Make it consistent with run-inside-docker.sh by also using -e and -x.
This makes development easier.
Change-Id: I733164829bf076fb42df3fde725f3e330f8abecc
Diffstat (limited to 'scripts/repo-install-test.sh')
| -rwxr-xr-x | scripts/repo-install-test.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index d3ce8d6..0a19b04 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -ex . "$(dirname "$0")/common.sh" docker_images_require "debian-repo-install-test" @@ -46,12 +46,14 @@ docker run --rm \ check_if_systemd_is_running # Run the test script -docker exec "$CONTAINER" /repo-install-test/run-inside-docker.sh -ret="$?" +ret=0 +if ! docker exec "$CONTAINER" /repo-install-test/run-inside-docker.sh; then + ret=1 +fi # Interactive shell if [ -n "$INTERACTIVE" ]; then - docker exec -it "$CONTAINER" bash + docker exec -it "$CONTAINER" bash || true fi docker container kill "$CONTAINER" |