aboutsummaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glcpp
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2018-04-24 18:49:20 +0100
committerEmil Velikov <[email protected]>2018-06-21 12:09:39 +0100
commit87cebace5411c59225e5aa5c1c844d93021e4257 (patch)
treeed6ac36b43c85964bcdec63d3bca3c657f5b527d /src/compiler/glsl/glcpp
parent1c1f70d12f2c6b5b9a7e70963df573adc734df91 (diff)
glsl: fold glcpp-test-cr-lf.sh into glcpp-test.sh
As of recently both of these have been reworked so they invoke a python script. At the same time the latter can be executed with the combined arguments of both scripts. AKA we no longer need to have them separate. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/compiler/glsl/glcpp')
-rwxr-xr-xsrc/compiler/glsl/glcpp/tests/glcpp-test-cr-lf.sh3
-rwxr-xr-xsrc/compiler/glsl/glcpp/tests/glcpp-test.sh2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf.sh b/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf.sh
deleted file mode 100755
index c41ee9f93fb..00000000000
--- a/src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-$PYTHON2 $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --windows --oldmac --bizarro
diff --git a/src/compiler/glsl/glcpp/tests/glcpp-test.sh b/src/compiler/glsl/glcpp/tests/glcpp-test.sh
index 3925c4ab8cf..7ca8aa26a87 100755
--- a/src/compiler/glsl/glcpp/tests/glcpp-test.sh
+++ b/src/compiler/glsl/glcpp/tests/glcpp-test.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-$PYTHON2 $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix
+$PYTHON2 $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro