If you want to do these all at once that's fine, in meson we execute each mode individually, that's also pretty easy in meson, and would require more work for autotools, so this seems fine: Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
Quoting Emil Velikov (2018-04-24 10:49:20) > From: Emil Velikov <emil.veli...@collabora.com> > > 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.veli...@collabora.com> > --- > src/compiler/Makefile.glsl.am | 1 - > src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf.sh | 3 --- > src/compiler/glsl/glcpp/tests/glcpp-test.sh | 2 +- > 3 files changed, 1 insertion(+), 5 deletions(-) > delete mode 100755 src/compiler/glsl/glcpp/tests/glcpp-test-cr-lf.sh > > diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am > index ad19b14e44..02a7f43215 100644 > --- 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 > index c41ee9f93f..0000000000 > --- 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 3925c4ab8c..7ca8aa26a8 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 > -- > 2.16.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
