frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Use .../piglit instead of .../piglit-*.py 

The latter use Python 2 and break with any non-ASCII characters in the
environment, the former uses Python 3 and works fine in that case.

Reviewed-by: Eric Anholt <eric@anholt.net>
(Cherry picked from commit 4aaaf69229)
This commit is contained in:
Michel Dänzer 2019-02-22 11:53:37 +01:00
parent 3314af2d15
commit 8db5a711da
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci/Dockerfile
View File

@ -13,8 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
echo 'deb-src https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/deb-src.list && \ echo 'deb-src https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/deb-src.list && \
apt-get update && \ apt-get update && \
apt-get install -y meson git ca-certificates cmake automake autoconf libtool libwaffle-dev \ apt-get install -y meson git ca-certificates cmake automake autoconf libtool libwaffle-dev \
libxkbcommon-dev python-mako python-numpy python-six python3-mako python3-numpy python3-six \ libxkbcommon-dev python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb && \
x11-utils x11-xserver-utils xauth xvfb && \
apt-get build-dep -y xorg-server && \ apt-get build-dep -y xorg-server && \
\ \
cd /root && \ cd /root && \
@ -31,6 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
find -name \*.a -o -name \*.o | xargs rm && \ find -name \*.a -o -name \*.o | xargs rm && \
\ \
apt-get purge -y git cmake automake autoconf libtool libwaffle-dev libxkbcommon-dev \ apt-get purge -y git cmake automake autoconf libtool libwaffle-dev libxkbcommon-dev \
python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb && \ x11-utils x11-xserver-utils xauth xvfb && \
apt-get autoremove -y --purge && apt-get clean && \ apt-get autoremove -y --purge && apt-get clean && \
rm -f /var/lib/apt/lists/deb.debian.org_debian_dists_testing_* rm -f /var/lib/apt/lists/deb.debian.org_debian_dists_testing_*

6
test/scripts/run-piglit.sh
View File

@ -46,8 +46,8 @@ $XSERVER_BUILDDIR/test/simple-xinit \
# Write out piglit-summaries. # Write out piglit-summaries.
SHORT_SUMMARY=$PIGLIT_RESULTS_DIR/summary SHORT_SUMMARY=$PIGLIT_RESULTS_DIR/summary
LONG_SUMMARY=$PIGLIT_RESULTS_DIR/long-summary LONG_SUMMARY=$PIGLIT_RESULTS_DIR/long-summary
$PIGLIT_DIR/piglit-summary.py -s $PIGLIT_RESULTS_DIR > $SHORT_SUMMARY $PIGLIT_DIR/piglit summary console -s $PIGLIT_RESULTS_DIR > $SHORT_SUMMARY
$PIGLIT_DIR/piglit-summary.py $PIGLIT_RESULTS_DIR > $LONG_SUMMARY $PIGLIT_DIR/piglit summary console $PIGLIT_RESULTS_DIR > $LONG_SUMMARY
# Write the short summary to make check's log file. # Write the short summary to make check's log file.
cat $SHORT_SUMMARY cat $SHORT_SUMMARY
@ -66,7 +66,7 @@ if ! grep "^ *crash: *0$" $SHORT_SUMMARY > /dev/null; then
status=1 status=1
fi fi
$PIGLIT_DIR/piglit-summary-html.py \ $PIGLIT_DIR/piglit summary html \
--overwrite \ --overwrite \
$PIGLIT_RESULTS_DIR/html \ $PIGLIT_RESULTS_DIR/html \
$PIGLIT_RESULTS_DIR $PIGLIT_RESULTS_DIR

2
test/scripts/xinit-piglit-session.sh
View File

@ -32,4 +32,4 @@ PIGLIT_ARGS="$PIGLIT_ARGS -x xloadqueryfont@1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont@1" PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont@1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont@2" PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont@2"
exec ./piglit-run.py xts-render $PIGLIT_ARGS $PIGLIT_RESULTS_DIR exec ./piglit run xts-render $PIGLIT_ARGS $PIGLIT_RESULTS_DIR