Mesa (master): Revert "src/glsl/glcpp: wire up glcpp-test to make check"

Matt Turner mattst88 at kemper.freedesktop.org
Tue Jan 31 18:59:05 PST 2012


Module: Mesa
Branch: master
Commit: 70dd17152dca228675f955da41bc9d285c6177d4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=70dd17152dca228675f955da41bc9d285c6177d4

Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Jan 31 21:33:21 2012 -0500

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

This reverts commit 2bb9f9e1fda61fceb9284cbb4619d7e60e39f190.

---

 src/glsl/glcpp/Makefile.am      |    2 --
 src/glsl/glcpp/tests/glcpp-test |    6 +-----
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index 68f55dc..198908c 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 1f37139..1db7523 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"



More information about the mesa-commit mailing list