aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-20 20:11:22 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-20 20:11:22 +0000
commit3979ef19e4024a90c19449e15f7bd877e3da0538 (patch)
treed241e7a46ef95c89b049492fd33bdc7fac0b0209
parent62ba0191fb7936e9e0555d1442abd49c210567d3 (diff)
downloadpaludis-3979ef19e4024a90c19449e15f7bd877e3da0538.tar.gz
paludis-3979ef19e4024a90c19449e15f7bd877e3da0538.tar.xz
All of util is now gtestified
-rw-r--r--paludis/util/Makefile.am.m414
-rw-r--r--paludis/util/files.m42
2 files changed, 2 insertions, 14 deletions
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 990aea0..3f6f468 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -7,20 +7,11 @@ include $(top_srcdir)/misc/common-makefile.am
define(`filelist', `')dnl
define(`headerlist', `')dnl
-define(`testlist', `')dnl
define(`gtestlist', `')dnl
define(`testscriptlist', `')dnl
define(`selist', `')dnl
define(`secleanlist', `')dnl
define(`seheaderlist', `')dnl
-define(`addtest', `define(`testlist', testlist `$1_TEST')dnl
-$1_TEST_SOURCES = $1_TEST.cc
-$1_TEST_LDADD = \
- test_extras.o \
- $(top_builddir)/test/libtest.a \
- libpaludisutil_@PALUDIS_PC_SLOT@.la
-$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 = \
@@ -52,7 +43,6 @@ ifelse(`$2', `hhx', `addhhx(`$1')', `')dnl
ifelse(`$2', `cc', `addcc(`$1')', `')dnl
ifelse(`$2', `impl', `addimpl(`$1')', `')dnl
ifelse(`$2', `se', `addse(`$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
@@ -81,9 +71,7 @@ libpaludisutil_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT
libpaludisutil_@PALUDIS_PC_SLOT@_la_LIBADD = $(PTHREAD_LIBS) $(RT_LIBS)
if HAVE_GTEST
-TESTS = testlist gtestlist
-else
-TESTS = testlist
+TESTS = gtestlist
endif
check_PROGRAMS = $(TESTS)
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index 1dd0836..ab81802 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/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(`accept_visitor', `hh')