src/glsl/glcpp: wire up glcpp-test to make check

Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index 198908c6f2a987976797c4285f7b0be0c6f62539..68f55dcfae67944ad4ea5a530538443bca0e7e6b 100644 (file)
--- a/src/glsl/glcpp/Makefile.am
+++ b/src/glsl/glcpp/Makefile.am
@@ -24,6 +24,8 @@
 noinst_LTLIBRARIES = libglcpp.la
 check_PROGRAMS = glcpp
 
+TESTS = tests/glcpp-test
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mapi \

diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test
index 1db752375673593a657672aa75fe3b917704e55d..1f371398f69647cc215c6ddfc792267829b8b21d 100755 (executable)
--- a/src/glsl/glcpp/tests/glcpp-test
+++ b/src/glsl/glcpp/tests/glcpp-test
@@ -34,10 +34,14 @@ total=0
 pass=0
 clean=0
 
+builddir=`pwd`
+testdir=`dirname $0`
+cd $testdir
+
 echo "====== Testing for correctness ======"
 for test in *.c; do
     echo -n "Testing $test..."
-    ../glcpp < $test > $test.out 2>&1
+    $builddir/glcpp < $test > $test.out 2>&1
     total=$((total+1))
     if cmp $test.expected $test.out >/dev/null 2>&1; then
        echo "PASS"