aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-11 19:43:20 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-11 19:43:20 +0100
commit39d202b163989f86baa2a692914cb0028458269f (patch)
tree08934d87a141ab56818bb7c61ab0d60be8e7ad45
parentd97af9621311ac54e956cc4447b9eff56872029a (diff)
downloadpaludis-39d202b163989f86baa2a692914cb0028458269f.tar.gz
paludis-39d202b163989f86baa2a692914cb0028458269f.tar.xz
fix tests
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc6
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_setup.sh2
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc6
-rwxr-xr-xpaludis/repositories/e/vdb_repository_TEST_setup.sh2
4 files changed, 8 insertions, 8 deletions
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index c0ae338..9713f0b 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -2564,17 +2564,17 @@ namespace test_cases
erepository::DepSpecPrettyPrinter pd(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->build_dependencies_key());
id->build_dependencies_key()->value()->root()->accept(pd);
- TEST_CHECK_STRINGIFY_EQUAL(pd, "( cat/pkg1 build: cat/pkg2 build,run: cat/pkg3 suggestion: post: )");
+ TEST_CHECK_STRINGIFY_EQUAL(pd, "( cat/pkg1 build: cat/pkg2 build+run: cat/pkg3 suggestion: post: )");
erepository::DepSpecPrettyPrinter pr(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->run_dependencies_key());
id->run_dependencies_key()->value()->root()->accept(pr);
- TEST_CHECK_STRINGIFY_EQUAL(pr, "( cat/pkg1 build: build,run: cat/pkg3 suggestion: post: )");
+ TEST_CHECK_STRINGIFY_EQUAL(pr, "( cat/pkg1 build: build+run: cat/pkg3 suggestion: post: )");
erepository::DepSpecPrettyPrinter pp(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->post_dependencies_key());
id->post_dependencies_key()->value()->root()->accept(pp);
- TEST_CHECK_STRINGIFY_EQUAL(pp, "( build: build,run: suggestion: cat/pkg4 post: cat/pkg5 )");
+ TEST_CHECK_STRINGIFY_EQUAL(pp, "( build: build+run: suggestion: cat/pkg4 post: cat/pkg5 )");
}
} test_e_repository_dependencies_rewriter;
diff --git a/paludis/repositories/e/e_repository_TEST_setup.sh b/paludis/repositories/e/e_repository_TEST_setup.sh
index 731300e..fa98322 100755
--- a/paludis/repositories/e/e_repository_TEST_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_setup.sh
@@ -2767,7 +2767,7 @@ cat <<END > category/package/package-1.ebuild || exit 1
EAPI="exheres-0"
SLOT="0"
PLATFORMS="test"
-DEPENDENCIES="cat/pkg1 build: cat/pkg2 build,run: cat/pkg3 suggestion: cat/pkg4 post: cat/pkg5"
+DEPENDENCIES="cat/pkg1 build: cat/pkg2 build+run: cat/pkg3 suggestion: cat/pkg4 post: cat/pkg5"
END
cd ..
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 3ce34fa..9626a42 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -283,17 +283,17 @@ namespace test_cases
erepository::DepSpecPrettyPrinter pd(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->build_dependencies_key());
id->build_dependencies_key()->value()->root()->accept(pd);
- TEST_CHECK_STRINGIFY_EQUAL(pd, "( cat/pkg1 build: cat/pkg2 build,run: cat/pkg3 suggestion: post: )");
+ TEST_CHECK_STRINGIFY_EQUAL(pd, "( cat/pkg1 build: cat/pkg2 build+run: cat/pkg3 suggestion: post: )");
erepository::DepSpecPrettyPrinter pr(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->run_dependencies_key());
id->run_dependencies_key()->value()->root()->accept(pr);
- TEST_CHECK_STRINGIFY_EQUAL(pr, "( cat/pkg1 build: build,run: cat/pkg3 suggestion: post: )");
+ TEST_CHECK_STRINGIFY_EQUAL(pr, "( cat/pkg1 build: build+run: cat/pkg3 suggestion: post: )");
erepository::DepSpecPrettyPrinter pp(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(id->post_dependencies_key());
id->post_dependencies_key()->value()->root()->accept(pp);
- TEST_CHECK_STRINGIFY_EQUAL(pp, "( build: build,run: suggestion: cat/pkg4 post: cat/pkg5 )");
+ TEST_CHECK_STRINGIFY_EQUAL(pp, "( build: build+run: suggestion: cat/pkg4 post: cat/pkg5 )");
}
} test_vdb_repository_dependencies_rewriter;
diff --git a/paludis/repositories/e/vdb_repository_TEST_setup.sh b/paludis/repositories/e/vdb_repository_TEST_setup.sh
index 0c647c7..1c19dfe 100755
--- a/paludis/repositories/e/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/e/vdb_repository_TEST_setup.sh
@@ -80,7 +80,7 @@ echo -n "cat-one/oink" >> world-no-match-no-eol
mkdir -p repo2/category/package-1 || exit 1
echo "exheres-0" >repo2/category/package-1/EAPI
echo "0" >repo2/category/package-1/SLOT
-echo "cat/pkg1 build: cat/pkg2 build,run: cat/pkg3 suggestion: cat/pkg4 post: cat/pkg5" >repo2/category/package-1/DEPENDENCIES
+echo "cat/pkg1 build: cat/pkg2 build+run: cat/pkg3 suggestion: cat/pkg4 post: cat/pkg5" >repo2/category/package-1/DEPENDENCIES
mkdir -p repo3