summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2018-08-16 13:59:38 +0100
committerEmil Velikov <[email protected]>2018-10-31 19:15:50 +0000
commit986033a2750c1160a4cef3c8418fc7f9e2b4fb5a (patch)
tree272f346932d8d545e79213feeab07d610fa3dfbd /src/compiler/glsl
parent6d7d3dbda531b0bc692ffb479d65527b2138dbf3 (diff)
configure: allow building with python3
Pretty much all of the scripts are python2+3 compatible. Check and allow using python3, while adjusting the PYTHON2 refs. Note: - python3.4 is used as it's the earliest supported version - python2 chosen prior to python3 v2: use python2 by default Cc: Ilia Mirkin <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
-rwxr-xr-xsrc/compiler/glsl/glcpp/tests/glcpp-test.sh2
-rwxr-xr-xsrc/compiler/glsl/tests/optimization-test.sh2
-rwxr-xr-xsrc/compiler/glsl/tests/warnings-test.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/glsl/glcpp/tests/glcpp-test.sh b/src/compiler/glsl/glcpp/tests/glcpp-test.sh
index b8397ec8902..666a617bfb1 100755
--- a/src/compiler/glsl/glcpp/tests/glcpp-test.sh
+++ b/src/compiler/glsl/glcpp/tests/glcpp-test.sh
@@ -13,4 +13,4 @@ if [ -z "$srcdir" -o -z "$abs_builddir" ]; then
abs_builddir=`pwd`/../../../
fi
-$PYTHON2 $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro
+$PYTHON $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro
diff --git a/src/compiler/glsl/tests/optimization-test.sh b/src/compiler/glsl/tests/optimization-test.sh
index 410ed262ef0..751529a5159 100755
--- a/src/compiler/glsl/tests/optimization-test.sh
+++ b/src/compiler/glsl/tests/optimization-test.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-$PYTHON2 $srcdir/glsl/tests/optimization_test.py --test-runner $abs_builddir/glsl/glsl_test
+$PYTHON $srcdir/glsl/tests/optimization_test.py --test-runner $abs_builddir/glsl/glsl_test
diff --git a/src/compiler/glsl/tests/warnings-test.sh b/src/compiler/glsl/tests/warnings-test.sh
index 09b6bb2fc98..12f68c2300f 100755
--- a/src/compiler/glsl/tests/warnings-test.sh
+++ b/src/compiler/glsl/tests/warnings-test.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-$PYTHON2 $srcdir/glsl/tests/warnings_test.py --glsl-compiler $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/
+$PYTHON $srcdir/glsl/tests/warnings_test.py --glsl-compiler $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/