From a2f5292c82ad07731d633b36a663e46adc181db9 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 24 Apr 2018 18:49:21 +0100 Subject: [PATCH] glsl/glcpp/tests: reinstate srcdir/abs_builddir blurb Bring back the "detection" of the said variables, to allow standalone execution. Fixes: db8cd8e36771 ("glcpp/tests: Convert shell scripts to a python script") Cc: Dylan Baker Signed-off-by: Emil Velikov Reviewed-by: Dylan Baker --- src/compiler/glsl/glcpp/tests/glcpp-test.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/compiler/glsl/glcpp/tests/glcpp-test.sh b/src/compiler/glsl/glcpp/tests/glcpp-test.sh index 7ca8aa26a87..b8397ec8902 100755 --- a/src/compiler/glsl/glcpp/tests/glcpp-test.sh +++ b/src/compiler/glsl/glcpp/tests/glcpp-test.sh @@ -1,3 +1,16 @@ #!/bin/sh +if [ -z "$srcdir" -o -z "$abs_builddir" ]; then + echo "" + echo "Warning: you're invoking the script manually and things may fail." + echo "Attempting to determine/set srcdir and abs_builddir variables." + echo "" + + # Should point to `dirname Makefile.glsl.am` + srcdir=./../../../ + cd `dirname "$0"` + # Should point to `dirname Makefile` equivalent to the above. + 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 -- 2.30.2