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>.
macos/master
Gert Wollny 4 years ago
parent 1dac420751
commit cbe5a89606
  1. 8
      ci/run_tests.sh

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

Loading…
Cancel
Save