ci: build venus at least

This doesn't do much.  It would be more ideal if it could do 32-bit
builds as well.

To run deqp-vk, while there is lavapipe, lavapipe lacks external memory
that vkr requires.  Some efforts will be needed to make the combination
work.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
macos/master
Chia-I Wu 3 years ago
parent ee1311f951
commit b0938ac0dd
  1. 5
      ci/.gitlab-ci.yml
  2. 1
      ci/build-container.sh
  3. 25
      ci/run_tests.sh

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

@ -48,6 +48,7 @@ apt-get -y install --no-install-recommends \
libxrandr-dev \ libxrandr-dev \
libxvmc-dev \ libxvmc-dev \
libsm-dev \ libsm-dev \
libvulkan-dev \
libwayland-dev \ libwayland-dev \
libwayland-egl-backend-dev \ libwayland-egl-backend-dev \
linux-image-amd64 \ linux-image-amd64 \

@ -14,6 +14,9 @@ run_setup()
use_trace_stderr=1 use_trace_stderr=1
fi fi
if [ "x$2" = "xvenus" ]; then
use_venus=1
fi
# Let .gitlab-ci or local ci runner set # Let .gitlab-ci or local ci runner set
# desired thread count # desired thread count
@ -65,8 +68,12 @@ run_setup()
export TRACING=-Dtracing=stderr export TRACING=-Dtracing=stderr
fi fi
if [ "x$use_venus" = "x1" ]; then
export VENUS=-Dvenus-experimental=true
fi
pwd | grep virglrenderer >/dev/null || pushd /virglrenderer && pushd $(pwd) pwd | grep virglrenderer >/dev/null || pushd /virglrenderer && pushd $(pwd)
meson build/ -Dprefix=/usr/local -Ddebug=true -Dtests=true --fatal-meson-warnings $FUZZER $TRACING meson build/ -Dprefix=/usr/local -Ddebug=true -Dtests=true --fatal-meson-warnings $FUZZER $TRACING $VENUS
ninja -C build -j$NUM_THREADS install ninja -C build -j$NUM_THREADS install
popd popd
} }
@ -111,6 +118,18 @@ run_make_check_trace_stderr()
) )
} }
run_make_check_venus()
{
run_setup meson venus
(
mkdir -p ./results/make_check_venus
VRENDTEST_USE_EGL_SURFACELESS=1 ninja -Cbuild -j$NUM_THREADS test
RET=$?
cp ./build/meson-logs/testlog.txt ./results/make_check_venus/
return $RET
)
}
run_deqp() run_deqp()
{ {
local retval=0 local retval=0
@ -202,6 +221,10 @@ parse_input()
run_make_check_trace_stderr run_make_check_trace_stderr
;; ;;
--make-check-venus)
run_make_check_venus
;;
--deqp-gl-gl-tests) --deqp-gl-gl-tests)
run_deqp gl gl run_deqp gl gl
;; ;;

Loading…
Cancel
Save