From 8db5a711da6a0b8f28c885b968b1e6bf2d45ce62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
Date: Fri, 22 Feb 2019 11:53:37 +0100
Subject: [PATCH] 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 4aaaf69229be574d6d11084225ecd91446a15170)
---
 .gitlab-ci/Dockerfile                | 5 ++---
 test/scripts/run-piglit.sh           | 6 +++---
 test/scripts/xinit-piglit-session.sh | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index c52736796..eee6c5b6d 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -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_*
diff --git a/test/scripts/run-piglit.sh b/test/scripts/run-piglit.sh
index b999c2598..8b9fda1a4 100755
--- a/test/scripts/run-piglit.sh
+++ b/test/scripts/run-piglit.sh
@@ -46,8 +46,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
@@ -66,7 +66,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
diff --git a/test/scripts/xinit-piglit-session.sh b/test/scripts/xinit-piglit-session.sh
index b907af0f3..b495c96d6 100755
--- a/test/scripts/xinit-piglit-session.sh
+++ b/test/scripts/xinit-piglit-session.sh
@@ -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