THRIFT-847 Test Framework harmonization across all languages

perl fixes: - generate Makfile for perl tests - add inc path to test git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1229745 13f79535-47bb-0310-9956-ffa450edef68
jcaden · Jan 10, 2012 · 01b568c · 01b568c
1 parent 4d5157d
commit 01b568c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -211,6 +211,8 @@
 /test/log/
 /test/test.log
 /test/perl/gen-*
+/test/perl/Makefile
+/test/perl/Makefile.in
 /test/php/gen-*
 /test/py/Makefile
 /test/py/Makefile.in

diff --git a/configure.ac b/configure.ac
@@ -492,6 +492,7 @@ AC_CONFIG_FILES([
   test/Makefile
   test/cpp/Makefile
   test/hs/Makefile
+  test/perl/Makefile
   test/py/Makefile
   test/py.twisted/Makefile
   test/rb/Makefile

diff --git a/test/perl/Makefile → test/perl/Makefile.am b/test/perl/Makefile → test/perl/Makefile.am
@@ -17,14 +17,13 @@
 # under the License.
 #
 
-# Default target is everything
-target: all
+THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
-# Tools
-THRIFT = ../../compiler/cpp/thrift
-
-all: ../ThriftTest.thrift
+stubs: ../ThriftTest.thrift
 	$(THRIFT) --gen perl ../ThriftTest.thrift
 
-clean:
+check: stubs
+
+clean-local:
 	$(RM) -r gen-perl
+
diff --git a/test/test.sh b/test/test.sh
@@ -114,6 +114,6 @@ do_test "java-cpp"  "binary" "buffered-ip" \
         "cpp/TestServer" \
         "10"
 do_test "perl-cpp"  "binary" "buffered-ip" \
-        "perl -I perl/gen-perl/ perl/TestClient.pl" \
+        "perl -I perl/gen-perl/ -I../lib/perl/lib/ perl/TestClient.pl" \
         "cpp/TestServer" \
         "10"