From cbe5a89606d4e8d5080599662725251e79109f13 Mon Sep 17 00:00:00 2001
From: Gert Wollny <gert.wollny@collabora.com>
Date: Tue, 2 Feb 2021 10:00:23 +0100
Subject: [PATCH] ci: Pass correct return value

popd overwrites $?, and since it always succeeds the CI was reporting
success even when piglit or deqp tests failed.

Fixes:8446009e7c889ad52d3d48b7fa82f8249edf3cf4
    ci: Use ci-templates to create the container image

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>.
---
 ci/run_tests.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index f5b81c1..8f5cec7 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -111,6 +111,7 @@ run_make_check_trace_stderr()
 
 run_deqp()
 {
+   local retval=0
    run_setup meson
    OGL_BACKEND="$1"
    SUITE="$2"
@@ -148,13 +149,15 @@ run_deqp()
    ./run_test_suite.sh --deqp ${TEST_SUITE} \
       --host-${OGL_BACKEND} \
       ${BACKENDS}
+   retval=$?
    popd
 
-   return $?
+   return $retval
 }
 
 run_piglit()
 {
+   local retval=0
    run_setup meson
 
    OGL_BACKEND="$1"
@@ -172,9 +175,10 @@ run_piglit()
    ./run_test_suite.sh --piglit --gles2 --gles3 \
       --host-${OGL_BACKEND} \
       ${BACKENDS}
+   retval=$?
    popd
 
-   return $?
+   return $retval
 }
 
 parse_input()