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 <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index ad19b14e446724523202cfdca9f6d129c62c5b89..02a7f4321503b1f7afd2eb35cca631cbf5b6fc8a 100644 (file)
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -31,7 +31,6 @@ EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README \
        SConscript.glsl
 
 TESTS += glsl/glcpp/tests/glcpp-test.sh                        \
-       glsl/glcpp/tests/glcpp-test-cr-lf.sh            \
        glsl/tests/blob-test                            \
        glsl/tests/cache-test                           \
        glsl/tests/general-ir-test                      \

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 (executable)
index c41ee9f..0000000
--- 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 3925c4ab8cf43add3bb6a3f04a48292436c25189..7ca8aa26a8767b8cd591fa8d268853f145109390 100755 (executable)
--- 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