aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-06-01 01:13:51 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-06-01 01:13:51 +0000
commitb5fd5eb668ba8769e7b2808b7e3e65883b8b3264 (patch)
treec4333c13315d08df79b69965f3adcd63904d96b9
parenta221f18987d6981b85f060390e5b36502ae9468a (diff)
downloadpaludis-b5fd5eb668ba8769e7b2808b7e3e65883b8b3264.tar.gz
paludis-b5fd5eb668ba8769e7b2808b7e3e65883b8b3264.tar.xz
Don't try to run the GLSA tests if GLSA support isn't compiled in.
-rw-r--r--paludis/repositories/gentoo/portage_repository_sets_TEST.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/paludis/repositories/gentoo/portage_repository_sets_TEST.cc b/paludis/repositories/gentoo/portage_repository_sets_TEST.cc
index d82342c..d0af1b7 100644
--- a/paludis/repositories/gentoo/portage_repository_sets_TEST.cc
+++ b/paludis/repositories/gentoo/portage_repository_sets_TEST.cc
@@ -99,6 +99,7 @@ namespace test_cases
}
} test_portage_repository_sets_maintainer_defined_sets_list;
+#if ENABLE_GLSA
/**
* \test Test PortageRepositorySets insecurity set.
*
@@ -123,13 +124,9 @@ namespace test_cases
tr1::shared_ptr<SetSpecTree::ConstItem> insecurity(repo->sets_interface->package_set(SetName("insecurity")));
DepSpecPrettyPrinter pretty(0, false);
insecurity->accept(pretty);
-#if ENABLE_GLSA
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-one/foo-1::test-repo-1 =cat-two/bar-1.5::test-repo-1 "
"=cat-two/bar-1.5.1::test-repo-1 =cat-three/baz-1.0::test-repo-1 "
"=cat-three/baz-1.1-r2::test-repo-1 =cat-three/baz-1.2::test-repo-1");
-#else
- TEST_CHECK_STRINGIFY_EQUAL(pretty, "");
-#endif
}
} test_portage_repository_sets_insecurity_set;
@@ -163,12 +160,9 @@ namespace test_cases
tr1::shared_ptr<const SetSpecTree::ConstItem> security(repo->sets_interface->package_set(SetName("security")));
DepSpecPrettyPrinter pretty(0, false);
security->accept(pretty);
-#if ENABLE_GLSA
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-two/bar-2.0::test-repo-1 =cat-three/baz-1.3::test-repo-1");
-#else
- TEST_CHECK_STRINGIFY_EQUAL(pretty, "");
-#endif
}
} test_portage_repository_sets_security_set;
+#endif
}