diff --git a/builders/Linux/Dockerfile b/builders/Linux/Dockerfile index de823d1..a01b6c8 100644 --- a/builders/Linux/Dockerfile +++ b/builders/Linux/Dockerfile @@ -47,7 +47,7 @@ RUN echo "mediafx ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/mediafx && chmod 044 VOLUME /mediafx WORKDIR /mediafx/build/Linux -ENTRYPOINT ["/usr/bin/xvfb-run", "--error-file", "/dev/stderr", "/entrypoint.sh"] +ENTRYPOINT ["/usr/bin/xvfb-run", "--server-args", "-screen 0 640x480x24", "--error-file", "/dev/stderr", "/entrypoint.sh"] FROM base as mediafx diff --git a/builders/Linux/mediafx-build.sh b/builders/Linux/mediafx-build.sh index 1bea405..cd79403 100755 --- a/builders/Linux/mediafx-build.sh +++ b/builders/Linux/mediafx-build.sh @@ -17,8 +17,10 @@ cd "$(dirname "${BASH_SOURCE[0]}")/../../build/Linux" || exit 1 (cmake --install-prefix /usr/local/Qt/${QT_VER:?}/gcc_64 ../.. && cmake --build . && sudo cmake --install .) || exit 1 if [[ -v MEDIAFX_TEST ]]; then + sudo apt install -y mesa-utils #XXX export GALLIUM_DRIVER=softpipe export LIBGL_ALWAYS_SOFTWARE=1 export DRI_NO_MSAA=1 + glxinfo make test CTEST_OUTPUT_ON_FAILURE=1 ARGS="${MEDIAFX_TEST}" || exit 1 fi \ No newline at end of file