From: Matt Turner <mattst88@gmail.com>
Date: Wed, 1 Feb 2012 02:33:21 +0000 (-0500)
Subject: Revert "src/glsl/glcpp: wire up glcpp-test to make check"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=70dd17152dca228675f955da41bc9d285c6177d4;p=mesa.git

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

This reverts commit 2bb9f9e1fda61fceb9284cbb4619d7e60e39f190.
---

diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index 68f55dcfae6..198908c6f2a 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 1f371398f69..1db75237567 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"