Merge lp:~ballogy/libunity/make-tests-optional into lp:libunity

[Balló György]

This change makes it possible to disable building tests with '--disable-tests' configure switch.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Hey György. Thanks for this. We're just going through some big changes
in the libunity build setup, so we'll get back to this one once the
bigger stuff lands. Sorry to keep you waiting.

[James Henstridge (jamesh)]

Is this MP still relevant? With a current checkout, if I run "make" followed by "make check", I see the Vala tests being compiled on the second invocation.

Does the configure flag add much benefit on top of this?

review: Needs Information

Unmerged revisions

88. By Balló György on 2011-11-25

Make building tests optional

=== modified file 'Makefile.am'
--- Makefile.am	2011-08-04 09:49:49 +0000
+++ Makefile.am	2011-11-27 02:20:11 +0000
@@ -4,9 +4,12 @@
   bindings \
   doc \
   examples \
-  test \
   vapi
 
+if WANT_TESTS
+SUBDIRS += test
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = unity.pc
 

=== modified file 'configure.ac'
--- configure.ac	2011-11-02 10:01:19 +0000
+++ configure.ac	2011-11-27 02:20:11 +0000
@@ -110,6 +110,14 @@
 AC_SUBST(GLIB_GENMARSHAL)
 
 ######################################################################
+# Check if build tests
+######################################################################
+AC_ARG_ENABLE([tests],
+	AC_HELP_STRING([--disable-tests], [Disable tests]),,
+	[enable_tests=yes])
+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
+
+######################################################################
 # Send directory information
 ######################################################################
 AC_DEFINE_UNQUOTED(DATADIR, "${prefix}/share",[Data directory])
@@ -141,6 +149,8 @@
   
   Build GI typelib : ${enable_introspection}
   
+  Build tests      : ${enable_tests}
+  
   CFlags           : ${CPPFLAGS} $MAINTAINER_CFLAGS
 ])