From 50119f15aa034f5dde7113df112e6694246cfa76 Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Thu, 29 Jan 2009 21:31:25 +0000 Subject: [PATCH] THRIFT-289. test: "make check" no longer runs the Java tests Thanks to David for the changes that straighten the makefiles out. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@739024 13f79535-47bb-0310-9956-ffa450edef68 --- configure.ac | 1 - lib/java/Makefile.am | 2 ++ test/Makefile.am | 7 ++----- test/java/Makefile.am | 8 -------- 4 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 test/java/Makefile.am diff --git a/configure.ac b/configure.ac index e42b8cb1..cc9d05fa 100644 --- a/configure.ac +++ b/configure.ac @@ -182,7 +182,6 @@ AC_CONFIG_FILES([ if/Makefile test/Makefile test/py/Makefile - test/java/Makefile test/rb/Makefile ]) diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am index 45a88e29..ae8a4d3f 100644 --- a/lib/java/Makefile.am +++ b/lib/java/Makefile.am @@ -12,3 +12,5 @@ clean-local: $$ANT clean check-local: all + $(ANT) test + diff --git a/test/Makefile.am b/test/Makefile.am index dab0f4e9..0c201c19 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,9 +1,5 @@ SUBDIRS = -if WITH_JAVA -SUBDIRS += java -endif - if WITH_PYTHON SUBDIRS += py endif @@ -23,7 +19,8 @@ libtestgencpp_la_SOURCES = \ gen-cpp/SecondService.cpp \ gen-cpp/ThriftTest_constants.cpp \ gen-cpp/ThriftTest.cpp \ - gen-cpp/ThriftTest_types.cpp + gen-cpp/ThriftTest_types.cpp \ + ThriftTest_extras.cpp libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la diff --git a/test/java/Makefile.am b/test/java/Makefile.am deleted file mode 100644 index 1b6e8395..00000000 --- a/test/java/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -check: - $(ANT) test - -# Make sure this doesn't fail if ant is not configured. -clean-local: - ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \ - $$ANT clean - -- 2.17.1