aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-03-04 13:40:29 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-03-04 13:40:29 +0000
commit169a9ebe045bc9804e054c35f239629d43450777 (patch)
treeb99e7302a0f4aa3620f74aabdc0898c411a87dbc
parentdd26244a925bac6f21db19f0c8eaf506c5df2f0c (diff)
downloadpaludis-169a9ebe045bc9804e054c35f239629d43450777.tar.gz
paludis-169a9ebe045bc9804e054c35f239629d43450777.tar.xz
Tidy up a bit
-rw-r--r--paludis/qa/Makefile.am.m46
-rw-r--r--paludis/qa/qa_environment_TEST.cc4
2 files changed, 6 insertions, 4 deletions
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 5239de1..b79d956 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -18,13 +18,14 @@ $1_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
libpaludisqa.la \
$(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(DYNAMIC_LD_LIBS) \
$(PCREPLUSPLUS_LIBS) \
$(LIBXML2DEPS_LIBS)
-$1_TEST_CXXFLAGS = -I$(top_srcdir)
+$1_TEST_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
')dnl
define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
define(`addhh', `define(`filelist', filelist `$1.hh')define(`headerlist', headerlist `$1.hh')')dnl
@@ -66,6 +67,7 @@ if ! MONOLITHIC
libpaludisqa_la_LIBADD = \
$(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
+ $(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
diff --git a/paludis/qa/qa_environment_TEST.cc b/paludis/qa/qa_environment_TEST.cc
index 8fcc64f..fb269ad 100644
--- a/paludis/qa/qa_environment_TEST.cc
+++ b/paludis/qa/qa_environment_TEST.cc
@@ -45,7 +45,7 @@ namespace test_cases
CreateMetadataCheck::identifier()))())(EbuildCheckData(
QualifiedPackageName("cat-one/pkg-one"), VersionSpec("1"), &env)));
{
- TestMessageSuffix suffix("r1=" + join(r1.begin(), r1.end(), "; "), false);
+ TestMessageSuffix l_suffix("r1=" + join(r1.begin(), r1.end(), "; "), false);
TEST_CHECK(r1.empty());
}
@@ -53,7 +53,7 @@ namespace test_cases
CreateMetadataCheck::identifier()))())(EbuildCheckData(
QualifiedPackageName("cat-one/pkg-one"), VersionSpec("2"), &env)));
{
- TestMessageSuffix suffix("r2=" + join(r2.begin(), r2.end(), "; "), false);
+ TestMessageSuffix l_suffix("r2=" + join(r2.begin(), r2.end(), "; "), false);
TEST_CHECK(! r2.empty());
}
}