aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/resolver')
-rw-r--r--paludis/resolver/Makefile.am22
-rw-r--r--paludis/resolver/resolver_TEST_virtuals.cc113
-rwxr-xr-xpaludis/resolver/resolver_TEST_virtuals_cleanup.sh9
-rwxr-xr-xpaludis/resolver/resolver_TEST_virtuals_setup.sh74
4 files changed, 1 insertions, 217 deletions
diff --git a/paludis/resolver/Makefile.am b/paludis/resolver/Makefile.am
index dddbf1bea..e334cb583 100644
--- a/paludis/resolver/Makefile.am
+++ b/paludis/resolver/Makefile.am
@@ -177,10 +177,6 @@ libpaludisresolver_a_SOURCES = \
use_existing.cc \
why_changed_choices.cc
-if ENABLE_VIRTUALS_REPOSITORY
-virtuals_tests = resolver_TEST_virtuals
-endif
-
noinst_LIBRARIES = libpaludisresolver.a
TESTS = \
@@ -194,8 +190,7 @@ TESTS = \
resolver_TEST_continue_on_failure \
resolver_TEST_uninstalls \
resolver_TEST_fetches \
- resolver_TEST_purges \
- $(virtuals_tests)
+ resolver_TEST_purges
check_PROGRAMS = $(TESTS)
@@ -205,7 +200,6 @@ check_SCRIPTS = \
resolver_TEST_serialisation_setup.sh resolver_TEST_serialisation_cleanup.sh \
resolver_TEST_suggestions_setup.sh resolver_TEST_suggestions_cleanup.sh \
resolver_TEST_simple_setup.sh resolver_TEST_simple_cleanup.sh \
- resolver_TEST_virtuals_setup.sh resolver_TEST_virtuals_cleanup.sh \
resolver_TEST_any_setup.sh resolver_TEST_any_cleanup.sh \
resolver_TEST_errors_setup.sh resolver_TEST_errors_cleanup.sh \
resolver_TEST_continue_on_failure_setup.sh resolver_TEST_continue_on_failure_cleanup.sh \
@@ -247,20 +241,6 @@ resolver_TEST_cycles_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @
resolver_TEST_cycles_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-resolver_TEST_virtuals_SOURCES = resolver_TEST_virtuals.cc
-
-resolver_TEST_virtuals_LDADD = \
- libpaludisresolvertest.a \
- $(top_builddir)/paludis/util/gtest_runner.o \
- $(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
- libpaludisresolver.a \
- $(DYNAMIC_LD_LIBS)
-
-resolver_TEST_virtuals_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_virtuals_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
resolver_TEST_suggestions_SOURCES = resolver_TEST_suggestions.cc
resolver_TEST_suggestions_LDADD = \
diff --git a/paludis/resolver/resolver_TEST_virtuals.cc b/paludis/resolver/resolver_TEST_virtuals.cc
deleted file mode 100644
index 5bbc7dcdc..000000000
--- a/paludis/resolver/resolver_TEST_virtuals.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2009, 2010, 2011 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 <paludis/resolver/resolver.hh>
-#include <paludis/resolver/resolver_functions.hh>
-#include <paludis/resolver/resolution.hh>
-#include <paludis/resolver/decision.hh>
-#include <paludis/resolver/constraint.hh>
-#include <paludis/resolver/resolvent.hh>
-#include <paludis/resolver/suggest_restart.hh>
-
-#include <paludis/environments/test/test_environment.hh>
-
-#include <paludis/util/make_named_values.hh>
-#include <paludis/util/options.hh>
-#include <paludis/util/wrapped_forward_iterator-impl.hh>
-#include <paludis/util/sequence.hh>
-#include <paludis/util/map.hh>
-#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/accept_visitor.hh>
-#include <paludis/util/make_shared_copy.hh>
-
-#include <paludis/user_dep_spec.hh>
-#include <paludis/repository_factory.hh>
-
-#include <paludis/resolver/resolver_test.hh>
-
-#include <list>
-#include <functional>
-#include <algorithm>
-#include <map>
-
-using namespace paludis;
-using namespace paludis::resolver;
-using namespace paludis::resolver::resolver_test;
-
-namespace
-{
- struct ResolverVirtualsTestCase : ResolverTestCase
- {
- std::shared_ptr<ResolverTestData> data;
-
- void SetUp()
- {
- data = std::make_shared<ResolverTestData>("virtuals", "0", "traditional");
- }
-
- void TearDown()
- {
- data.reset();
- }
- };
-}
-
-TEST_F(ResolverVirtualsTestCase, Virtuals)
-{
- std::shared_ptr<const Resolved> resolved(data->get_resolved("virtuals/target"));
-
- check_resolved(resolved,
- n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
- .change(QualifiedPackageName("cat/foo-a"))
- .change(QualifiedPackageName("virtuals/target"))
- .finished()),
- n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
- .finished()),
- n::taken_unconfirmed_decisions() = make_shared_copy(DecisionChecks()
- .finished()),
- n::taken_unorderable_decisions() = make_shared_copy(DecisionChecks()
- .finished()),
- n::untaken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
- .finished()),
- n::untaken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
- .finished())
- );
-}
-
-TEST_F(ResolverVirtualsTestCase, VirtualsTarget)
-{
- std::shared_ptr<const Resolved> resolved(data->get_resolved("virtual/virtual-target"));
-
- check_resolved(resolved,
- n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
- .change(QualifiedPackageName("cat/real-target"))
- .finished()),
- n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
- .finished()),
- n::taken_unconfirmed_decisions() = make_shared_copy(DecisionChecks()
- .finished()),
- n::taken_unorderable_decisions() = make_shared_copy(DecisionChecks()
- .finished()),
- n::untaken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
- .finished()),
- n::untaken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
- .finished())
- );
-}
-
diff --git a/paludis/resolver/resolver_TEST_virtuals_cleanup.sh b/paludis/resolver/resolver_TEST_virtuals_cleanup.sh
deleted file mode 100755
index 85c857e08..000000000
--- a/paludis/resolver/resolver_TEST_virtuals_cleanup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d resolver_TEST_virtuals_dir ] ; then
- rm -fr resolver_TEST_virtuals_dir
-else
- true
-fi
-
diff --git a/paludis/resolver/resolver_TEST_virtuals_setup.sh b/paludis/resolver/resolver_TEST_virtuals_setup.sh
deleted file mode 100755
index cffe73b31..000000000
--- a/paludis/resolver/resolver_TEST_virtuals_setup.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-mkdir resolver_TEST_virtuals_dir || exit 1
-cd resolver_TEST_virtuals_dir || exit 1
-
-mkdir -p build
-mkdir -p distdir
-mkdir -p installed
-
-mkdir -p repo/{profiles/profile,metadata}
-
-cd repo
-echo "repo" > profiles/repo_name
-: > profiles/categories
-cat <<'END' > profiles/profile/make.defaults
-ARCH=test
-END
-cat <<'END' > profiles/profile/virtuals
-virtual/foo cat/foo-a
-virtual/virtual-target cat/real-target
-END
-
-# common providers
-
-echo 'cat' >> profiles/categories
-
-mkdir -p 'cat/real-target'
-cat <<END > cat/real-target/real-target-1.ebuild
-DESCRIPTION="dep"
-KEYWORDS="test"
-SLOT="0"
-PROVIDE="virtual/virtual-target"
-END
-
-mkdir -p 'cat/foo-a'
-cat <<END > cat/foo-a/foo-a-1.ebuild
-DESCRIPTION="dep"
-KEYWORDS="test"
-SLOT="0"
-PROVIDE="virtual/foo"
-END
-
-mkdir -p 'cat/foo-b'
-cat <<END > cat/foo-b/foo-b-1.ebuild
-DESCRIPTION="dep"
-KEYWORDS="test"
-SLOT="0"
-PROVIDE="virtual/foo"
-END
-
-mkdir -p 'cat/foo-c'
-cat <<END > cat/foo-c/foo-c-1.ebuild
-DESCRIPTION="dep"
-KEYWORDS="test"
-SLOT="0"
-PROVIDE="virtual/foo"
-END
-
-# virtuals
-echo 'virtuals' >> profiles/categories
-
-mkdir -p 'virtuals/target'
-cat <<END > virtuals/target/target-1.ebuild
-DESCRIPTION="target"
-KEYWORDS="test"
-SLOT="0"
-DEPEND="
- ( virtual/foo )
- "
-END
-
-cd ..
-