Author: bryanduxbury
Date: Thu Jan 29 21:31:25 2009
New Revision: 739024
URL: http://svn.apache.org/viewvc?rev=739024&view=rev
Log:
THRIFT-289. test: "make check" no longer runs the Java tests
Thanks to David for the changes that straighten the makefiles out.
Removed:
incubator/thrift/trunk/test/java/Makefile.am
Modified:
incubator/thrift/trunk/configure.ac
incubator/thrift/trunk/lib/java/Makefile.am
incubator/thrift/trunk/test/Makefile.am
Modified: incubator/thrift/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=739024&r1=739023&r2=739024&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Thu Jan 29 21:31:25 2009
@@ -182,7 +182,6 @@
if/Makefile
test/Makefile
test/py/Makefile
- test/java/Makefile
test/rb/Makefile
])
Modified: incubator/thrift/trunk/lib/java/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/Makefile.am?rev=739024&r1=739023&r2=739024&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/Makefile.am (original)
+++ incubator/thrift/trunk/lib/java/Makefile.am Thu Jan 29 21:31:25 2009
@@ -12,3 +12,5 @@
$$ANT clean
check-local: all
+ $(ANT) test
+
Modified: incubator/thrift/trunk/test/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/Makefile.am?rev=739024&r1=739023&r2=739024&view=diff
==============================================================================
--- incubator/thrift/trunk/test/Makefile.am (original)
+++ incubator/thrift/trunk/test/Makefile.am Thu Jan 29 21:31:25 2009
@@ -1,9 +1,5 @@
SUBDIRS =
-if WITH_JAVA
-SUBDIRS += java
-endif
-
if WITH_PYTHON
SUBDIRS += py
endif
@@ -23,7 +19,8 @@
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
