You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2011/09/14 05:43:49 UTC
svn commit: r1170426 - in /thrift/trunk: Makefile.am configure.ac
lib/cpp/Makefile.am
Author: jfarrell
Date: Wed Sep 14 03:43:49 2011
New Revision: 1170426
URL: http://svn.apache.org/viewvc?rev=1170426&view=rev
Log:
Thrift-1345: Allow building without test cases
Client: build env
Patch: Vitali Lovich
Adds --without-tests to configure to omit processing/building the test directories.
Modified:
thrift/trunk/Makefile.am
thrift/trunk/configure.ac
thrift/trunk/lib/cpp/Makefile.am
Modified: thrift/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/Makefile.am?rev=1170426&r1=1170425&r2=1170426&view=diff
==============================================================================
--- thrift/trunk/Makefile.am (original)
+++ thrift/trunk/Makefile.am Wed Sep 14 03:43:49 2011
@@ -19,7 +19,11 @@
ACLOCAL_AMFLAGS = -I ./aclocal
-SUBDIRS = compiler/cpp lib test
+SUBDIRS = compiler/cpp lib
+
+if WITH_TESTS
+SUBDIRS += test
+endif
dist-hook:
find $(distdir) -type f \( -iname ".deps" -or -iname ".libs" -or -iname ".gitignore" \
Modified: thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/thrift/trunk/configure.ac?rev=1170426&r1=1170425&r2=1170426&view=diff
==============================================================================
--- thrift/trunk/configure.ac (original)
+++ thrift/trunk/configure.ac Wed Sep 14 03:43:49 2011
@@ -277,6 +277,12 @@ if test "$with_go" = "yes"; then
fi
AM_CONDITIONAL(WITH_GO, [test "$have_go" = "yes"])
+have_tests=yes
+if test "$with_tests" = "no"; then
+ have_tests="no"
+fi
+AM_CONDITIONAL(WITH_TESTS, [test "$have_tests" = "yes"])
+
AC_C_CONST
AC_C_INLINE
AC_C_VOLATILE
Modified: thrift/trunk/lib/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/Makefile.am?rev=1170426&r1=1170425&r2=1170426&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/Makefile.am (original)
+++ thrift/trunk/lib/cpp/Makefile.am Wed Sep 14 03:43:49 2011
@@ -17,7 +17,11 @@
# under the License.
#
-SUBDIRS = . test
+SUBDIRS = .
+
+if WITH_TESTS
+SUBDIRS += test
+endif
pkgconfigdir = $(libdir)/pkgconfig