fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: fold glcpp-test-cr-lf.sh into glcpp-test.sh

Browse source 
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>
This commit is contained in:
Emil Velikov 2018-04-24 18:49:20 +01:00 • committed by Emil Velikov
parent 1c1f70d12f
commit 87cebace54
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/compiler/Makefile.glsl.am
View file

@ -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 \

3
src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf.sh
View file

@ -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

2
src/compiler/glsl/glcpp/tests/glcpp-test.sh
View file

@ -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