summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-01-28 22:42:04 -0500
committerMatt Turner <mattst88@gmail.com>2012-01-30 21:10:03 -0500
commit2bb9f9e1fda61fceb9284cbb4619d7e60e39f190 (patch)
tree4ddce86bcb776010230fdfb7eaa62574a100bb47 /src
parent82060adcde88eb57cc0a3b71d23f003f5637986f (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/glsl/glcpp/Makefile.am2
-rwxr-xr-xsrc/glsl/glcpp/tests/glcpp-test6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index 198908c6f2a..68f55dcfae6 100644
--- 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 1db75237567..1f371398f69 100755
--- 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"