aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-27 16:35:33 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-27 16:35:33 +0100
commit58b0c87ae639014fdb70ed6d8b9c4af2f83b92ae (patch)
treec58d3600761e5e9af5832dc55c45a8e75fa78c28
parente9bcce8dd7c018614479bab0d6e11ad53272b036 (diff)
downloadpaludis-58b0c87ae639014fdb70ed6d8b9c4af2f83b92ae.tar.gz
paludis-58b0c87ae639014fdb70ed6d8b9c4af2f83b92ae.tar.xz
All tests are now gtestified
-rw-r--r--paludis/Makefile.am.m415
-rw-r--r--paludis/files.m42
2 files changed, 3 insertions, 14 deletions
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 3b19ce5..a954739 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -6,22 +6,12 @@ dnl vim: set ft=m4 noet :
include $(top_srcdir)/misc/common-makefile.am
define(`filelist', `')dnl
-define(`testlist', `')dnl
define(`gtestlist', `')dnl
define(`headerlist', `')dnl
define(`selist', `')dnl
define(`secleanlist', `')dnl
define(`seheaderlist', `')dnl
define(`testscriptlist', `')dnl
-define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
-$1_TEST_SOURCES = $1_TEST.cc
-$1_TEST_LDADD = \
- $(top_builddir)/test/libtest.a \
- libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- $(DYNAMIC_LD_LIBS)
-$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-')dnl
define(`addgtest', `define(`gtestlist', gtestlist `$1_TEST')dnl
$1_TEST_SOURCES = $1_TEST.cc
$1_TEST_LDADD = \
@@ -55,7 +45,6 @@ ifelse(`$2', `hhx', `addhhx(`$1')', `')dnl
ifelse(`$2', `cc', `addcc(`$1')', `')dnl
ifelse(`$2', `se', `addse(`$1')', `')dnl
ifelse(`$2', `impl', `addimpl(`$1')', `')dnl
-ifelse(`$2', `test', `addtest(`$1')', `')dnl
ifelse(`$2', `gtest', `addgtest(`$1')', `')dnl
ifelse(`$2', `testscript', `addtestscript(`$1')', `')')dnl
define(`add', `addthis(`$1',`$2')addthis(`$1',`$3')addthis(`$1',`$4')dnl
@@ -140,9 +129,9 @@ libpaludis_@PALUDIS_PC_SLOT@_la_LIBADD = \
$(PTHREAD_LIBS)
if HAVE_GTEST
-TESTS = testlist gtestlist
+TESTS = gtestlist
else
-TESTS = testlist
+TESTS =
endif
check_PROGRAMS = $(TESTS) stripper_TEST_binary
diff --git a/paludis/files.m4 b/paludis/files.m4
index c7e4c4d..8e44a2e 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -5,7 +5,7 @@ dnl
dnl This file is used to avoid having to make lots of repetitive changes in
dnl Makefile.am every time we add a source or test file. The first parameter is
dnl the base filename with no extension; later parameters can be `hh', `cc',
-dnl `test', `impl', `testscript'. Note that there isn't much error checking done
+dnl `gtest', `impl', `testscript'. Note that there isn't much error checking done
dnl on this file at present...
add(`about', `hh', `gtest')