From e4db178a1b250394c121760411d1c774e898ab25 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 20 Mar 2012 19:03:20 -0500 Subject: Chase-recommended simplification of test-inclusion autoconf. --- Makefile.am | 2 +- configure.ac | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index bef67bd..4d64e31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = \ data \ po -if BUILD_TESTS +if HAVE_GTEST SUBDIRS += \ test diff --git a/configure.ac b/configure.ac index a429d17..a5ca692 100644 --- a/configure.ac +++ b/configure.ac @@ -76,15 +76,6 @@ AS_IF([test "x$with_gtk" = x3], AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) -########################### -# Test Dependencies -########################### - -AC_ARG_ENABLE([tests], - AC_HELP_STRING([--disable-tests], [Disable test scripts and tools]),, - [enable_tests=auto]) -AM_CONDITIONAL(BUILD_TESTS, test xyes = xyes) - ########################### # Status Provider Deps ########################### @@ -126,6 +117,7 @@ AC_SUBST(COVERAGE_LDFLAGS) m4_include([m4/gtest.m4]) CHECK_GTEST +AM_CONDITIONAL([HAVE_GTEST], [test "x$have_gtest" = xyes]) ########################### # Check to see if we're local -- cgit v1.2.3 From 1985b73f61e084b60ed9f64de78f541f57059f9d Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 20 Mar 2012 19:14:04 -0500 Subject: Substituting build code under test lib for individual includes for example. --- test/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 8986a40..7d6d95e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -21,9 +21,6 @@ libgtest_a_CPPFLAGS = \ TESTS += test-gtest test_gtest_SOURCES = \ - $(top_srcdir)/src/launcher-menu-item.c \ - $(top_srcdir)/src/default-applications.c \ - $(top_srcdir)/src/seen-db.c \ test-gtest.cpp test_gtest_CPPFLAGS = \ $(APPLET_CFLAGS) \ @@ -31,6 +28,7 @@ test_gtest_CPPFLAGS = \ test_gtest_LDFLAGS = -pthread test_gtest_LDADD = \ $(APPLET_LIBS) \ + $(top_builddir)/src/.libs/libindicator-messages-status-provider.la \ libgtest.a -- cgit v1.2.3 From 0e5b8f77b3320b12f497153b7a781272aacac00a Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Wed, 21 Mar 2012 10:22:50 -0500 Subject: Reverted r268, restored BUILD_TESTS; ted explains upstream arch patch. --- Makefile.am | 2 +- configure.ac | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4d64e31..bef67bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = \ data \ po -if HAVE_GTEST +if BUILD_TESTS SUBDIRS += \ test diff --git a/configure.ac b/configure.ac index a5ca692..a429d17 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,15 @@ AS_IF([test "x$with_gtk" = x3], AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) +########################### +# Test Dependencies +########################### + +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [Disable test scripts and tools]),, + [enable_tests=auto]) +AM_CONDITIONAL(BUILD_TESTS, test xyes = xyes) + ########################### # Status Provider Deps ########################### @@ -117,7 +126,6 @@ AC_SUBST(COVERAGE_LDFLAGS) m4_include([m4/gtest.m4]) CHECK_GTEST -AM_CONDITIONAL([HAVE_GTEST], [test "x$have_gtest" = xyes]) ########################### # Check to see if we're local -- cgit v1.2.3