From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q3SXs-0006CF-GF for garchives@archives.gentoo.org; Sat, 26 Mar 2011 12:24:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CE3D1C021; Sat, 26 Mar 2011 12:24:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3917A1C021 for ; Sat, 26 Mar 2011 12:24:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90D331B4122 for ; Sat, 26 Mar 2011 12:24:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F34C78006E for ; Sat, 26 Mar 2011 12:24:10 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: <42bb1918870f230062f362138c89452e541b704d.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: / X-VCS-Repository: proj/libbash X-VCS-Files: .gitignore Makefile.am X-VCS-Directories: / X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 42bb1918870f230062f362138c89452e541b704d Date: Sat, 26 Mar 2011 12:24:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 68ad8487f2410cb34e651b6642b8f82b commit: 42bb1918870f230062f362138c89452e541b704d Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Sat Mar 26 10:20:45 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Sat Mar 26 11:16:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D42bb1918 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 =3D -D_GLIBCXX_DEBUG endif =20 if HAVE_GTEST -TESTS +=3D core_unittests builtin_unittests post_check -check_PROGRAMS =3D core_unittests builtin_unittests post_check - -core_unittests_SOURCES =3D test/run_tests.cpp \ - src/core/tests/symbols_test.cpp \ - src/core/tests/interpreter_test.cpp -core_unittests_LDADD =3D ${GTEST_LIBS} libcppbash.la -core_unittests_LDFLAGS =3D -static - -builtin_unittests_SOURCES =3D test/run_tests.cpp \ - src/builtins/tests/echo_tests.cpp \ - src/builtins/tests/boolean_tests.cpp -builtin_unittests_LDADD =3D ${GTEST_LIBS} libcppbash.la -builtin_unittests_LDFLAGS =3D -static - -post_check_SOURCES =3D test/run_tests.cpp \ - test/post_check.cpp \ - test/walker_test.cpp -post_check_LDADD =3D ${GTEST_LIBS}\ - $(BOOST_SYSTEM_LIB)\ - $(BOOST_FILESYSTEM_LIB)\ - libcppbash.la -post_check_LDFLAGS =3D -static +TESTS +=3D cppunittests +check_PROGRAMS =3D cppunittests + +cppunittests_SOURCES =3D 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 =3D libcppbash.la \ + $(GTEST_LIBS) \ + $(BOOST_SYSTEM_LIB) \ + $(BOOST_FILESYSTEM_LIB) +cppunittests_LDFLAGS =3D -static endif =20 GENERATED_PARSER_C =3D bashastLexer.c bashastParser.c