From 81ccc7a484ae8f9f242a42a80a3d09e6987cc816 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 26 Feb 2017 21:06:07 +0000 Subject: [PATCH] glsl/tests/warnings-test: add fallback srcdir/abs_builddir defines There is no robust way to detect either one, so simply hope for the best and warn just in case. Signed-off-by: Emil Velikov Acked-by: Kenneth Graunke Reviewed-by: Eric Engestrom --- src/compiler/glsl/tests/warnings-test.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/tests/warnings-test.sh b/src/compiler/glsl/tests/warnings-test.sh index b19e2fe5171..7891c2477fe 100755 --- a/src/compiler/glsl/tests/warnings-test.sh +++ b/src/compiler/glsl/tests/warnings-test.sh @@ -1,8 +1,21 @@ #!/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 "" + + # Variable should point to the Makefile.glsl.am + srcdir=./../../ + cd `dirname "$0"` + # Variable should point to glsl_compiler + abs_builddir=`pwd`/../../ +fi + # Execute several shaders, and check that the InfoLog outcome is the expected. -compiler=./glsl_compiler +compiler=$abs_builddir/glsl_compiler total=0 pass=0 -- 2.30.2