diff options
| author | Helen Koike <helen.koike@collabora.com> | 2023-03-15 12:55:12 -0300 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-03-16 22:13:05 +0000 |
| commit | 1d0cc570865b61fbba5667257a8c432cf951d8e2 (patch) | |
| tree | f40d6308d5d83be192c3d154d42e7edfed81c30e | |
| parent | 89432213ef0fab2eebd8f8d4ecf678f2b5b7ecda (diff) | |
| download | mesa-1d0cc570865b61fbba5667257a8c432cf951d8e2.tar.gz mesa-1d0cc570865b61fbba5667257a8c432cf951d8e2.tar.bz2 mesa-1d0cc570865b61fbba5667257a8c432cf951d8e2.zip | |
android/ci: raise error on script when not related to the tests
The cuttlefish-runner.sh script was failing before reaching the test
suite execution (which was not executing the complete test suite due to
the previous non-catched failures, and was erroneous passing) and we
were not catching that.
Add set -e so we can catch those.
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21941>
| -rwxr-xr-x | .gitlab-ci/cuttlefish-runner.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index 75553f8fc0c..48ed85c9083 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -x +set -xe export HOME=/cuttlefish export PATH=$PATH:/cuttlefish/bin @@ -88,6 +88,7 @@ $ADB shell rm /vendor/lib64/egl/libGLESv2_emulation.so RESULTS=/data/results +set +e $ADB shell "mkdir /data/results; cd /data; strace -o /data/results/out.strace -f -s 1000 ./deqp-runner \ suite \ --suite /data/deqp-$DEQP_SUITE.toml \ @@ -101,6 +102,7 @@ $ADB shell "mkdir /data/results; cd /data; strace -o /data/results/out.strace -f $DEQP_RUNNER_OPTIONS" EXIT_CODE=$? +set -e $ADB pull $RESULTS results |