diff --git a/Dockerfile b/Dockerfile index bd4413d67fa1feed9fa9fa770c033624c8109692..cc419d7515b315109d5c8cff8bb2b10bc4c28474 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,11 +22,19 @@ RUN echo "build ALL=(ALL) NOPASSWD: ALL" | tee -a /etc/sudoers USER build WORKDIR /home/build/ -ENV MAKEFLAGS=-j9 COPY clone-qt.sh /home/build RUN ./clone-qt.sh + +ENV MAKEFLAGS=-j8 COPY build-qt.sh /home/build RUN ./build-qt.sh + +COPY build-qtbase-tests.sh /home/build +RUN ./build-qtbase-tests.sh + +COPY build-qtwayland-tests.sh /home/build +RUN ./build-qtwayland-tests.sh + ENV XDG_RUNTIME_DIR=/tmp ENV QT_QPA_PLATFORM=wayland COPY test-qt.sh /home/build diff --git a/build-qt.sh b/build-qt.sh index 7b17bc6dbf499931a9dbe70db19c4a44758fa3d7..e2f9a833fde7d4faf9471e7a19d3d4f298cc10ca 100755 --- a/build-qt.sh +++ b/build-qt.sh @@ -10,5 +10,6 @@ cd build-qt -no-feature-vnc \ -no-linuxfb \ -nomake examples \ + -nomake tests \ -feature-wayland-client -time make module-qtwayland +time make -ks module-qtwayland diff --git a/build-qtbase-tests.sh b/build-qtbase-tests.sh new file mode 100755 index 0000000000000000000000000000000000000000..00971c57b7acf740fe3e25acb56eac757eb7dde7 --- /dev/null +++ b/build-qtbase-tests.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -ex +cd ~/build-qt/qtbase +make sub-tests diff --git a/build-qtwayland-tests.sh b/build-qtwayland-tests.sh new file mode 100755 index 0000000000000000000000000000000000000000..2fbccda3f2d15bea9acbeb709f5bf85c140ec861 --- /dev/null +++ b/build-qtwayland-tests.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -ex +cd ~/build-qt/qtwayland +make sub-tests