Commit 4aaaf692 authored by Michel Dänzer's avatar Michel Dänzer Committed by Michel Dänzer

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's avatarEric Anholt <eric@anholt.net>
parent f56d8e22
......@@ -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 && \
apt-get update && \
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 \
x11-utils x11-xserver-utils xauth xvfb && \
libxkbcommon-dev python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb && \
apt-get build-dep -y xorg-server && \
\
cd /root && \
......@@ -31,6 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
find -name \*.a -o -name \*.o | xargs rm && \
\
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 && \
rm -f /var/lib/apt/lists/deb.debian.org_debian_dists_testing_*
......@@ -49,8 +49,8 @@ $XSERVER_BUILDDIR/test/simple-xinit \
# Write out piglit-summaries.
SHORT_SUMMARY=$PIGLIT_RESULTS_DIR/summary
LONG_SUMMARY=$PIGLIT_RESULTS_DIR/long-summary
$PIGLIT_DIR/piglit-summary.py -s $PIGLIT_RESULTS_DIR > $SHORT_SUMMARY
$PIGLIT_DIR/piglit-summary.py $PIGLIT_RESULTS_DIR > $LONG_SUMMARY
$PIGLIT_DIR/piglit summary console -s $PIGLIT_RESULTS_DIR > $SHORT_SUMMARY
$PIGLIT_DIR/piglit summary console $PIGLIT_RESULTS_DIR > $LONG_SUMMARY
# Write the short summary to make check's log file.
cat $SHORT_SUMMARY
......@@ -69,7 +69,7 @@ if ! grep "^ *crash: *0$" $SHORT_SUMMARY > /dev/null; then
status=1
fi
$PIGLIT_DIR/piglit-summary-html.py \
$PIGLIT_DIR/piglit summary html \
--overwrite \
$PIGLIT_RESULTS_DIR/html \
$PIGLIT_RESULTS_DIR
......
......@@ -32,4 +32,4 @@ PIGLIT_ARGS="$PIGLIT_ARGS -x xloadqueryfont@1"
PIGLIT_ARGS="$PIGLIT_ARGS -x xqueryfont@1"
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment