diff options
author | 2011-03-20 20:39:16 +0000 | |
---|---|---|
committer | 2011-03-20 20:39:16 +0000 | |
commit | 9f8fe4fad5615ba8572d5f9f4a83daa2786153f2 (patch) | |
tree | 5488c1c0a47d2749d43e3cd038333f326d252abb | |
parent | 3979ef19e4024a90c19449e15f7bd877e3da0538 (diff) | |
download | paludis-9f8fe4fad5615ba8572d5f9f4a83daa2786153f2.tar.gz paludis-9f8fe4fad5615ba8572d5f9f4a83daa2786153f2.tar.xz |
Don't bother with test_extras
-rw-r--r-- | paludis/Makefile.am.m4 | 1 | ||||
-rw-r--r-- | paludis/args/Makefile.am | 1 | ||||
-rw-r--r-- | paludis/environments/no_config/Makefile.am | 1 | ||||
-rw-r--r-- | paludis/environments/paludis/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/environments/portage/Makefile.am | 1 | ||||
-rw-r--r-- | paludis/repositories/accounts/Makefile.am | 1 | ||||
-rw-r--r-- | paludis/repositories/e/Makefile.am | 28 | ||||
-rw-r--r-- | paludis/repositories/fake/Makefile.am | 3 | ||||
-rw-r--r-- | paludis/repositories/unavailable/Makefile.am | 1 | ||||
-rw-r--r-- | paludis/repositories/unpackaged/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/repositories/unwritten/Makefile.am | 1 | ||||
-rw-r--r-- | paludis/repositories/virtuals/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/resolver/Makefile.am | 12 | ||||
-rw-r--r-- | paludis/util/Makefile.am.m4 | 1 | ||||
-rw-r--r-- | paludis/util/test_extras.cc | 75 |
15 files changed, 0 insertions, 132 deletions
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4 index a27da865b..5c116fbd4 100644 --- a/paludis/Makefile.am.m4 +++ b/paludis/Makefile.am.m4 @@ -15,7 +15,6 @@ define(`testscriptlist', `')dnl define(`addtest', `define(`testlist', testlist `$1_TEST')dnl $1_TEST_SOURCES = $1_TEST.cc $1_TEST_LDADD = \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am index a79faf6ce..ab2c710c3 100644 --- a/paludis/args/Makefile.am +++ b/paludis/args/Makefile.am @@ -53,7 +53,6 @@ lib_LTLIBRARIES = libpaludisargs_@PALUDIS_PC_SLOT@.la check_PROGRAMS = $(TESTS) test_ldadd = \ - $(top_builddir)/paludis/util/test_extras.o \ libpaludisargs_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la diff --git a/paludis/environments/no_config/Makefile.am b/paludis/environments/no_config/Makefile.am index 8b2481588..3c39c5586 100644 --- a/paludis/environments/no_config/Makefile.am +++ b/paludis/environments/no_config/Makefile.am @@ -35,7 +35,6 @@ check_SCRIPTS = no_config_environment_TEST_setup.sh no_config_environment_TEST_c no_config_environment_TEST_SOURCES = no_config_environment_TEST.cc no_config_environment_TEST_LDADD = \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am index 0703e1936..8a82fbfa2 100644 --- a/paludis/environments/paludis/Makefile.am +++ b/paludis/environments/paludis/Makefile.am @@ -68,7 +68,6 @@ check_SCRIPTS = \ paludis_environment_TEST_SOURCES = paludis_environment_TEST.cc paludis_environment_TEST_LDADD = \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -79,7 +78,6 @@ paludis_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGIN world_TEST_SOURCES = world_TEST.cc world_TEST_LDADD = \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am index ae3f2b50e..b8143ed92 100644 --- a/paludis/environments/portage/Makefile.am +++ b/paludis/environments/portage/Makefile.am @@ -30,7 +30,6 @@ TESTS = portage_environment_TEST portage_environment_TEST_SOURCES = portage_environment_TEST.cc portage_environment_TEST_LDADD = \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ diff --git a/paludis/repositories/accounts/Makefile.am b/paludis/repositories/accounts/Makefile.am index f9d94a0b6..06311730b 100644 --- a/paludis/repositories/accounts/Makefile.am +++ b/paludis/repositories/accounts/Makefile.am @@ -41,7 +41,6 @@ accounts_repository_TEST_SOURCES = accounts_repository_TEST.cc accounts_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am index 34980a1e4..a0833fe6f 100644 --- a/paludis/repositories/e/Makefile.am +++ b/paludis/repositories/e/Makefile.am @@ -185,7 +185,6 @@ e_repository_TEST_SOURCES = e_repository_TEST.cc e_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -196,7 +195,6 @@ depend_rdepend_TEST_SOURCES = depend_rdepend_TEST.cc depend_rdepend_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -207,7 +205,6 @@ e_repository_TEST_ever_SOURCES = e_repository_TEST_ever.cc e_repository_TEST_ever_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -218,7 +215,6 @@ e_repository_TEST_exheres_0_SOURCES = e_repository_TEST_exheres_0.cc e_repository_TEST_exheres_0_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -229,7 +225,6 @@ e_repository_TEST_3_SOURCES = e_repository_TEST_3.cc e_repository_TEST_3_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -240,7 +235,6 @@ e_repository_TEST_4_SOURCES = e_repository_TEST_4.cc e_repository_TEST_4_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -251,7 +245,6 @@ e_repository_TEST_2_SOURCES = e_repository_TEST_2.cc e_repository_TEST_2_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -262,7 +255,6 @@ e_repository_TEST_1_SOURCES = e_repository_TEST_1.cc e_repository_TEST_1_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -273,7 +265,6 @@ e_repository_TEST_0_SOURCES = e_repository_TEST_0.cc e_repository_TEST_0_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -284,7 +275,6 @@ e_repository_TEST_phases_SOURCES = e_repository_TEST_phases.cc e_repository_TEST_phases_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -295,7 +285,6 @@ e_repository_TEST_exlibs_SOURCES = e_repository_TEST_exlibs.cc e_repository_TEST_exlibs_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -306,7 +295,6 @@ e_repository_TEST_replacing_SOURCES = e_repository_TEST_replacing.cc e_repository_TEST_replacing_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -317,7 +305,6 @@ e_repository_TEST_symlink_rewriting_SOURCES = e_repository_TEST_symlink_rewritin e_repository_TEST_symlink_rewriting_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -328,7 +315,6 @@ vdb_repository_TEST_SOURCES = vdb_repository_TEST.cc vdb_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -339,7 +325,6 @@ vdb_repository_TEST_eapis_SOURCES = vdb_repository_TEST_eapis.cc vdb_repository_TEST_eapis_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -350,7 +335,6 @@ vdb_repository_TEST_cache_SOURCES = vdb_repository_TEST_cache.cc vdb_repository_TEST_cache_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -361,7 +345,6 @@ exndbam_repository_TEST_SOURCES = exndbam_repository_TEST.cc exndbam_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -372,7 +355,6 @@ vdb_merger_TEST_SOURCES = vdb_merger_TEST.cc vdb_merger_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -383,7 +365,6 @@ vdb_unmerger_TEST_SOURCES = vdb_unmerger_TEST.cc vdb_unmerger_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -394,7 +375,6 @@ e_repository_sets_TEST_SOURCES = e_repository_sets_TEST.cc e_repository_sets_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -405,7 +385,6 @@ dep_parser_TEST_SOURCES = dep_parser_TEST.cc dep_parser_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -416,7 +395,6 @@ aa_visitor_TEST_SOURCES = aa_visitor_TEST.cc aa_visitor_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -427,7 +405,6 @@ fetch_visitor_TEST_SOURCES = fetch_visitor_TEST.cc fetch_visitor_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -438,7 +415,6 @@ source_uri_finder_TEST_SOURCES = source_uri_finder_TEST.cc source_uri_finder_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -449,7 +425,6 @@ fix_locked_dependencies_TEST_SOURCES = fix_locked_dependencies_TEST.cc fix_locked_dependencies_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -460,7 +435,6 @@ ebuild_flat_metadata_cache_TEST_SOURCES = ebuild_flat_metadata_cache_TEST.cc ebuild_flat_metadata_cache_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -618,7 +592,6 @@ GLSA_TESTS = xml_things_TEST xml_things_TEST_SOURCES = xml_things_TEST.cc xml_things_TEST_LDADD = \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ @@ -637,7 +610,6 @@ e_repository_TEST_pbin_SOURCES = e_repository_TEST_pbin.cc e_repository_TEST_pbin_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am index faa7faa55..c51b5ff0a 100644 --- a/paludis/repositories/fake/Makefile.am +++ b/paludis/repositories/fake/Makefile.am @@ -16,7 +16,6 @@ EXTRA_DIST = \ fake_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a @@ -24,7 +23,6 @@ fake_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ fake_installed_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a @@ -32,7 +30,6 @@ fake_installed_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DE dep_parser_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am index 2ce2cb6ae..25857f17d 100644 --- a/paludis/repositories/unavailable/Makefile.am +++ b/paludis/repositories/unavailable/Makefile.am @@ -35,7 +35,6 @@ unavailable_repository_TEST_SOURCES = unavailable_repository_TEST.cc unavailable_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am index 2dfa85e25..9ef30d09c 100644 --- a/paludis/repositories/unpackaged/Makefile.am +++ b/paludis/repositories/unpackaged/Makefile.am @@ -35,7 +35,6 @@ unpackaged_repository_TEST_SOURCES = unpackaged_repository_TEST.cc unpackaged_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) @@ -46,7 +45,6 @@ installed_repository_TEST_SOURCES = installed_repository_TEST.cc installed_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) diff --git a/paludis/repositories/unwritten/Makefile.am b/paludis/repositories/unwritten/Makefile.am index 7533657a2..5e2a18dc1 100644 --- a/paludis/repositories/unwritten/Makefile.am +++ b/paludis/repositories/unwritten/Makefile.am @@ -31,7 +31,6 @@ unwritten_repository_TEST_SOURCES = unwritten_repository_TEST.cc unwritten_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a \ $(DYNAMIC_LD_LIBS) diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am index 3afc3c21a..3058f3125 100644 --- a/paludis/repositories/virtuals/Makefile.am +++ b/paludis/repositories/virtuals/Makefile.am @@ -32,7 +32,6 @@ EXTRA_DIST = $(virtuals_repository_TEST_SOURCES) $(installed_virtuals_repository virtuals_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a @@ -40,7 +39,6 @@ virtuals_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGIN installed_virtuals_repository_TEST_LDADD = \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/test/libtest.a diff --git a/paludis/resolver/Makefile.am b/paludis/resolver/Makefile.am index db13db63d..926aa2274 100644 --- a/paludis/resolver/Makefile.am +++ b/paludis/resolver/Makefile.am @@ -217,7 +217,6 @@ resolver_TEST_blockers_SOURCES = resolver_TEST_blockers.cc resolver_TEST_blockers_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -230,7 +229,6 @@ resolver_TEST_cycles_SOURCES = resolver_TEST_cycles.cc resolver_TEST_cycles_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -243,7 +241,6 @@ resolver_TEST_virtuals_SOURCES = resolver_TEST_virtuals.cc resolver_TEST_virtuals_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -256,7 +253,6 @@ resolver_TEST_suggestions_SOURCES = resolver_TEST_suggestions.cc resolver_TEST_suggestions_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -269,7 +265,6 @@ resolver_TEST_serialisation_SOURCES = resolver_TEST_serialisation.cc resolver_TEST_serialisation_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -282,7 +277,6 @@ resolver_TEST_simple_SOURCES = resolver_TEST_simple.cc resolver_TEST_simple_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -295,7 +289,6 @@ resolver_TEST_any_SOURCES = resolver_TEST_any.cc resolver_TEST_any_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -308,7 +301,6 @@ resolver_TEST_errors_SOURCES = resolver_TEST_errors.cc resolver_TEST_errors_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -321,7 +313,6 @@ resolver_TEST_continue_on_failure_SOURCES = resolver_TEST_continue_on_failure.cc resolver_TEST_continue_on_failure_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -334,7 +325,6 @@ resolver_TEST_uninstalls_SOURCES = resolver_TEST_uninstalls.cc resolver_TEST_uninstalls_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -347,7 +337,6 @@ resolver_TEST_fetches_SOURCES = resolver_TEST_fetches.cc resolver_TEST_fetches_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ @@ -360,7 +349,6 @@ resolver_TEST_purges_SOURCES = resolver_TEST_purges.cc resolver_TEST_purges_LDADD = \ libpaludisresolvertest.a \ - $(top_builddir)/paludis/util/test_extras.o \ $(top_builddir)/test/libtest.a \ $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \ $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \ diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4 index 3f6f46839..0d2dc07b5 100644 --- a/paludis/util/Makefile.am.m4 +++ b/paludis/util/Makefile.am.m4 @@ -61,7 +61,6 @@ DEFS=\ -DLIBEXECDIR=\"$(libexecdir)\" EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 selist secleanlist \ testscriptlist \ - test_extras.cc \ gtest_runner.cc \ echo_functions.bash.in SUBDIRS = . diff --git a/paludis/util/test_extras.cc b/paludis/util/test_extras.cc deleted file mode 100644 index de2f48ab9..000000000 --- a/paludis/util/test_extras.cc +++ /dev/null @@ -1,75 +0,0 @@ -/* vim: set sw=4 sts=4 et foldmethod=syntax : */ - -/* - * Copyright (c) 2006, 2007, 2010 Ciaran McCreesh - * - * This file is part of the Paludis package manager. Paludis is free software; - * you can redistribute it and/or modify it under the terms of the GNU General - * Public License version 2, as published by the Free Software Foundation. - * - * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <exception> -#include <paludis/util/attributes.hh> -#include <paludis/util/exception.hh> -#include <paludis/util/log.hh> -#include <paludis/util/stringify.hh> -#include <paludis/util/system.hh> -#include <sstream> -#include <fcntl.h> -#include <test/test_framework.hh> - -/** \file - * Some extras, for test cases. - * - */ - -using namespace paludis; - -namespace -{ - std::string verbose_exception_to_debug_string( - const std::exception & e) PALUDIS_ATTRIBUTE((noinline)); - - struct C - { - /* icky hack: don't bother destructing s, it makes log assplode */ - std::stringstream * s; - int dev_null_pid; - - C() : - s(new std::stringstream), - dev_null_pid(open("/dev/stderr", O_RDONLY)) - { - test::set_exception_to_debug_string(&verbose_exception_to_debug_string); - - if (getenv_with_default("PALUDIS_TESTS_KEEP_LOG", "").empty()) - Log::get_instance()->set_log_stream(s); - - if (getenv_with_default("PALUDIS_TESTS_NO_DEBUG_LOG", "").empty()) - Log::get_instance()->set_log_level(ll_debug); - } - }; - - static const C my_c; - - std::string verbose_exception_to_debug_string(const std::exception & e) - { - const paludis::Exception * ee; - if (0 != ((ee = dynamic_cast<const Exception *>(&e)))) - return stringify(ee->what()) + " (message " + ee->message() + - (ee->empty() ? std::string(", no backtrace") : - ", backtrace " + ee->backtrace(" -> ")) + ")"; - else - return e.what(); - } -} - |