diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-31 19:33:19 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-31 20:36:36 +0100 |
| commit | ef5218fa53588cace0b71cedaa67e41528f3a661 (patch) | |
| tree | e47142e2ffac17d25b374cdea43a311b06346b66 | |
| parent | 6d21ec7b4e0edce77ea8a9a28a15a5b554aa716c (diff) | |
Use python3 to run piglit
| -rw-r--r-- | .appveyor.yml | 4 | ||||
| -rwxr-xr-x | test/scripts/run-piglit.sh | 6 | ||||
| -rwxr-xr-x | test/scripts/xinit-piglit-session.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 674450322..5dc1f23e5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -66,8 +66,8 @@ python3-lxml,\ xtrans,\ xkbcomp,\ xkeyboard-config,\ -python2-mako,\ -python2-six" +python3-mako,\ +python3-six" - echo Install done cache: - C:\cache diff --git a/test/scripts/run-piglit.sh b/test/scripts/run-piglit.sh index b999c2598..0200c240a 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 +python3 $PIGLIT_DIR/piglit-summary.py -s $PIGLIT_RESULTS_DIR > $SHORT_SUMMARY +python3 $PIGLIT_DIR/piglit-summary.py $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 \ +python3 $PIGLIT_DIR/piglit-summary-html.py \ --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 c26735d49..d9aa40f64 100755 --- a/test/scripts/xinit-piglit-session.sh +++ b/test/scripts/xinit-piglit-session.sh @@ -41,4 +41,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 -f $PIGLITCONF $PIGLIT_ARGS $PIGLIT_RESULTS_DIR +exec python3 ./piglit-run.py xts-render -f $PIGLITCONF $PIGLIT_ARGS $PIGLIT_RESULTS_DIR |