ci: Add build with the stderr tracer

v2: Fix artifact copy output path (Tomeu)

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
macos/master
Gert Wollny 4 years ago committed by Gert Wollny
parent 024a0d969d
commit 7db2faa354
  1. 5
      ci/.gitlab-ci.yml
  2. 29
      ci/run_tests.sh

@ -59,6 +59,11 @@ make check clang-fuzzer:
TEST_SUITE: '--make-check-clang-fuzzer' TEST_SUITE: '--make-check-clang-fuzzer'
extends: .make_check_base extends: .make_check_base
make check trace-stderr:
variables:
TEST_SUITE: '--make-check-trace-stderr'
extends: .make_check_base
.tests: .tests:
stage: test stage: test
extends: .tests_base extends: .tests_base

@ -10,6 +10,11 @@ run_setup()
use_clang_fuzzer=1 use_clang_fuzzer=1
fi fi
if [ "x$2" = "xtrace_stderr" ]; then
use_trace_stderr=1
fi
# Let .gitlab-ci or local ci runner set # Let .gitlab-ci or local ci runner set
# desired thread count # desired thread count
NUM_THREADS=${NUM_THREADS:-$(expr $(expr $(nproc) / 8) + 1)} NUM_THREADS=${NUM_THREADS:-$(expr $(expr $(nproc) / 8) + 1)}
@ -56,7 +61,11 @@ run_setup()
export FUZZER=-Dfuzzer=true export FUZZER=-Dfuzzer=true
fi fi
meson build/ -Dprefix=/usr/local -Ddebug=true -Dtests=true --fatal-meson-warnings $FUZZER if [ "x$use_trace_stderr" = "x1" ]; then
export TRACING=-Dtracing=stderr
fi
meson build/ -Dprefix=/usr/local -Ddebug=true -Dtests=true --fatal-meson-warnings $FUZZER $TRACING
ninja -C build -j$NUM_THREADS install ninja -C build -j$NUM_THREADS install
} }
@ -86,6 +95,20 @@ run_make_check_clang_fuzzer()
) )
} }
run_make_check_trace_stderr()
{
run_setup meson trace_stderr
(
mkdir -p ./results/make_check_trace_stderr
pushd ./build
VRENDTEST_USE_EGL_SURFACELESS=1 ninja -j$NUM_THREADS test
RET=$?
cp ./meson-logs/testlog.txt ../results/make_check_trace_stderr/
popd
return $RET
)
}
run_deqp() run_deqp()
{ {
run_setup meson run_setup meson
@ -169,6 +192,10 @@ parse_input()
run_make_check_clang_fuzzer run_make_check_clang_fuzzer
;; ;;
--make-check-trace-stderr)
run_make_check_trace_stderr
;;
--deqp-gl-gl-tests) --deqp-gl-gl-tests)
run_deqp gl gl run_deqp gl gl
;; ;;

Loading…
Cancel
Save