fix tests

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 c0ae338fe..9713f0b89 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 731300ee5..fa983227d 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 3ce34fa6e..9626a42c3 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 0c647c79e..1c19dfe68 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