summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-01-31 21:33:21 -0500
committerMatt Turner <mattst88@gmail.com>2012-01-31 21:33:21 -0500
commit70dd17152dca228675f955da41bc9d285c6177d4 (patch)
treea4fd90cafe437595a5eb9b93e89b90a5ecfd1c54
parent8c436b4ea670d4630767a742dac5aad14e18aef9 (diff)
Revert "src/glsl/glcpp: wire up glcpp-test to make check"
-rw-r--r--src/glsl/glcpp/Makefile.am2
-rwxr-xr-xsrc/glsl/glcpp/tests/glcpp-test6
2 files changed, 1 insertions, 7 deletions
diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index 68f55dcfae..198908c6f2 100644
--- a/src/glsl/glcpp/Makefile.am
+++ b/src/glsl/glcpp/Makefile.am
@@ -24,8 +24,6 @@
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 1f371398f6..1db7523756 100755
--- a/src/glsl/glcpp/tests/glcpp-test
+++ b/src/glsl/glcpp/tests/glcpp-test
@@ -34,14 +34,10 @@ 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..."
- $builddir/glcpp < $test > $test.out 2>&1
+ ../glcpp < $test > $test.out 2>&1
total=$((total+1))
if cmp $test.expected $test.out >/dev/null 2>&1; then
echo "PASS"