[gentoo-commits] proj/libbash:master commit in: /

["Petteri Räty" <betelgeuse@gentoo.org>]

commit:     42bb1918870f230062f362138c89452e541b704d
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Mar 26 10:20:45 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 11:16:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=42bb1918

Single binary for unittests

There's no benefit from splitting the unit tests to multiple programs so
in order to make build system maintenance easier just have single
cppunittests binary.

---
 .gitignore  |    4 +---
 Makefile.am |   36 ++++++++++++++----------------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0936bd..efb8f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,9 +16,7 @@ install-sh
 missing
 Makefile
 autom4te.cache
-core_unittests
-builtin_unittests
-post_check
+cppunittests
 bashast.g
 bashast.tokens
 bashast/.DS_Store

diff --git a/Makefile.am b/Makefile.am
index 21342d5..3c5a738 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,29 +62,21 @@ AM_CPPFLAGS = -D_GLIBCXX_DEBUG
 endif
 
 if HAVE_GTEST
-TESTS += core_unittests builtin_unittests post_check
-check_PROGRAMS = core_unittests builtin_unittests post_check
-
-core_unittests_SOURCES = test/run_tests.cpp \
-						 src/core/tests/symbols_test.cpp \
-						 src/core/tests/interpreter_test.cpp
-core_unittests_LDADD = ${GTEST_LIBS} libcppbash.la
-core_unittests_LDFLAGS = -static
-
-builtin_unittests_SOURCES = test/run_tests.cpp \
-							src/builtins/tests/echo_tests.cpp \
-							src/builtins/tests/boolean_tests.cpp
-builtin_unittests_LDADD = ${GTEST_LIBS} libcppbash.la
-builtin_unittests_LDFLAGS = -static
-
-post_check_SOURCES = test/run_tests.cpp \
-					 test/post_check.cpp \
-					 test/walker_test.cpp
-post_check_LDADD = ${GTEST_LIBS}\
-				   $(BOOST_SYSTEM_LIB)\
-				   $(BOOST_FILESYSTEM_LIB)\
-				   libcppbash.la
-post_check_LDFLAGS = -static
+TESTS += cppunittests
+check_PROGRAMS = cppunittests
+
+cppunittests_SOURCES =  test/run_tests.cpp \
+						src/core/tests/symbols_test.cpp \
+						src/core/tests/interpreter_test.cpp \
+						src/builtins/tests/echo_tests.cpp \
+						src/builtins/tests/boolean_tests.cpp \
+						test/post_check.cpp \
+						test/walker_test.cpp
+cppunittests_LDADD = libcppbash.la \
+					 $(GTEST_LIBS) \
+					 $(BOOST_SYSTEM_LIB) \
+					 $(BOOST_FILESYSTEM_LIB)
+cppunittests_LDFLAGS = -static
 endif
 
 GENERATED_PARSER_C = bashastLexer.c bashastParser.c