Merge lp:~ballogy/libappindicator/make-tests-optional into lp:libappindicator/0.5

[Ted Gould]

This change makes it possible to disable building tests with '--disable-tests' and '--disable-mono-test' configure switches.

By default, mono-test is build only if nunit or mono-nunit available on build system.

[Ted Gould (ted)]

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2011-06-15 15:44:55 +0000
+++ Makefile.am	2012-01-27 22:06:37 +0000
@@ -4,9 +4,12 @@
       src		\
 	  bindings	\
 	  example	\
-	  tests		\
 	  docs
 
+if WANT_TESTS
+SUBDIRS += tests
+endif
+
 EXTRA_DIST = \
 	m4/introspection.m4 \
 	gtk-doc.make \

=== modified file 'bindings/mono/Makefile.am'
--- bindings/mono/Makefile.am	2011-02-24 04:46:17 +0000
+++ bindings/mono/Makefile.am	2012-01-27 22:06:37 +0000
@@ -3,7 +3,9 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = appindicator-sharp-0.1.pc
 
+if BUILD_MONO_TEST
 TEST = AppIndicator.Test.dll
+endif
 
 API = libappindicator-api.xml
 MIDDLE_API = libappindicator-api.middle
@@ -40,16 +42,24 @@
 	$(API) \
 	$(MIDDLE_API) \
 	$(RAW_API) \
-	$(TEST) \
 	$(DLLPOLICY) \
 	$(DLLPOLICY1) \
 	$(WRAPPER_FREE_BINDING) \
 	$(POLICY).config \
 	$(POLICY1).config
 
+if BUILD_MONO_TEST
+CLEANFILES += $(TEST) 
+endif
+
 DISTCLEANFILES = $(ASSEMBLY).config
+
+if BUILD_MONO_TEST
 TEST_SOURCES = TestIndicator.cs
+endif
+
 customs = ApplicationIndicator.custom
+
 EXTRA_DIST =					\
 	AssemblyInfo.cs \
 	$(RAW_API)				\
@@ -60,13 +70,19 @@
 	$(ASSEMBLY_NAME).snk			\
 	$(POLICY).config.in \
 	$(POLICY1).config.in \
-	$(customs)				\
-	$(TEST_SOURCES)
+	$(customs)
+
+if BUILD_MONO_TEST
+EXTRA_DIST += $(TEST_SOURCES)
+endif
 
 GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib
 
 references = $(GTK_SHARP_LIBS)
-test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY)
+
+if BUILD_MONO_TEST
+test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) $(MONO_NUNIT_LIBS) -r:$(ASSEMBLY)
+endif
 
 $(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING)
 	$(GAPI_PARSER) $(srcdir)/app-indicator.sources.xml
@@ -130,10 +146,12 @@
 	echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)";  \
             $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1;
 
+if BUILD_MONO_TEST
 $(TEST): $(ASSEMBLY) $(TEST_SOURCES)
 	$(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES)
 
 all: $(TEST)
+endif
 
 $(POLICY).config: $(POLICY).config.in Makefile
 	sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \

=== modified file 'configure.ac'
--- configure.ac	2011-09-28 17:41:09 +0000
+++ configure.ac	2012-01-27 22:06:37 +0000
@@ -153,7 +153,25 @@
 AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
 AC_SUBST(GAPI_FIXUP)
 
-PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7)
+# Check for nunit
+AC_ARG_ENABLE([mono-test],
+	AC_HELP_STRING([--disable-mono-test], [Disable mono test]),,
+	[enable_mono_test=auto])
+
+if test x"$enable_mono_test" != x"no" ; then
+   PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7,
+      [have_nunit=yes],
+      [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit,
+         [have_nunit=yes],
+         [have_nunit=no])
+   ])
+   if test x${enable_mono_test} = xyes && test x${have_nunit} = xno; then
+     AC_MSG_ERROR([Mono test configured but nunit not found])
+   fi
+else
+   have_nunit=no
+fi
+AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes)
 
 ###########################
 # Check to see if we're local
@@ -189,6 +207,14 @@
 AC_SUBST(PYGTK_CODEGEN)
 AC_MSG_RESULT($PYGTK_CODEGEN)
 
+#########################
+# 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"])
+
 ###########################
 # Files
 ###########################
@@ -226,4 +252,6 @@
 
 	Prefix:        $prefix
 	GTK+ Version:  $with_gtk
+	Tests:         $enable_tests
+	Mono tests:    $have_nunit
 ])