gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Fri Jan 22 06:10:14 EST 2016
Updated via https://github.com/Gnucash/gnucash/commit/06c37959 (commit)
via https://github.com/Gnucash/gnucash/commit/5dfb8fd0 (commit)
from https://github.com/Gnucash/gnucash/commit/92f28636 (commit)
commit 06c379594bc66383295ae50ed4fe1882d1b0e85f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jan 22 11:13:36 2016 +0100
Align gtkmm test suite with recent template updates
This is not used by default for gnucash, and maybe even
not used at all. At least it's consistent with the other
test files now.
diff --git a/src/optional/gtkmm/test/Makefile.am b/src/optional/gtkmm/test/Makefile.am
index 6d6cdcd..7ad1ea4 100644
--- a/src/optional/gtkmm/test/Makefile.am
+++ b/src/optional/gtkmm/test/Makefile.am
@@ -8,17 +8,25 @@ include $(top_srcdir)/test-templates/Makefile.decl
#after $(top_srcdir) or $(top_builddir):
MODULEPATH = src/optional/gtkmm
+#The test program. You'll need to add to this if you have more than one module above.
+
+check_PROGRAMS = test-gtkmm
+
+TESTS = ${check_PROGRAMS}
+
+test_gtkmmdir = ${top_srcdir}/${MODULEPATH}/test
+
+#Program files for tests go here. It's probably best to have one for
+#each file in the parent directory. Include
+#test_foo_support.c if you have one and aren't building the
+#support library.
test_gtkmm_SOURCES = \
test-gtkmm.cpp \
test-book.cpp
-test_gtkmm_HEADERSS = \
+test_gtkmm_HEADERS = \
$(top_srcdir)/${MODULEPATH}/gncmm/Book.hpp
-TEST_PROGS += test-gtkmm
-
-noinst_PROGRAMS = ${TEST_PROGS}
-
#The tests might require more libraries, but try to keep them
#as independent as possible.
test_gtkmm_LDADD = ${top_builddir}/${MODULEPATH}/libgncmod-gtkmm.la \
commit 5dfb8fd0c54c9e13e388f90f34de78e61198a25c
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Jan 22 11:13:19 2016 +0100
Revert "Fix typo"
This reverts commit 92f2863658d46f6aea297149d35966194dae3ae4.
diff --git a/src/optional/gtkmm/test/Makefile.am b/src/optional/gtkmm/test/Makefile.am
index 6535f22..6d6cdcd 100644
--- a/src/optional/gtkmm/test/Makefile.am
+++ b/src/optional/gtkmm/test/Makefile.am
@@ -12,7 +12,7 @@ test_gtkmm_SOURCES = \
test-gtkmm.cpp \
test-book.cpp
-test_gtkmm_HEADERS = \
+test_gtkmm_HEADERSS = \
$(top_srcdir)/${MODULEPATH}/gncmm/Book.hpp
TEST_PROGS += test-gtkmm
Summary of changes:
src/optional/gtkmm/test/Makefile.am | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list