aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-02 23:45:15 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-02 23:45:15 +0100
commit7765dfc289cda92b259af400b62b7f0bca4cb6c0 (patch)
treed023474e3cd80411b2b43e143d26636d82e7caa1
parent84b5eba15ed723c382ed5560835e1eba43e1ef36 (diff)
downloadpaludis-7765dfc289cda92b259af400b62b7f0bca4cb6c0.tar.gz
paludis-7765dfc289cda92b259af400b62b7f0bca4cb6c0.tar.xz
Fix paths
-rw-r--r--paludis/repositories/e/vdb_merger_TEST.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/repositories/e/vdb_merger_TEST.cc b/paludis/repositories/e/vdb_merger_TEST.cc
index 223a36f..0a8f190 100644
--- a/paludis/repositories/e/vdb_merger_TEST.cc
+++ b/paludis/repositories/e/vdb_merger_TEST.cc
@@ -100,14 +100,14 @@ namespace
void SetUp()
{
target = GetParam();
- root_dir = FSPath::cwd() / "vdb_merger_TEST_dir" / target / "root";
+ root_dir = FSPath::cwd() / "vdb_merger_TEST_dir" / (target + "_dir") / "root";
merger = std::make_shared<VDBMergerNoDisplay>(make_named_values<VDBMergerParams>(
n::config_protect() = "/protected_file /protected_dir",
n::config_protect_mask() = "/protected_dir/unprotected_file /protected_dir/unprotected_dir",
- n::contents_file() = FSPath::cwd() / "vdb_merger_TEST_dir/CONTENTS" / target,
+ n::contents_file() = FSPath::cwd() / "vdb_merger_TEST_dir/CONTENTS" / (target + "_dir"),
n::environment() = &env,
n::fix_mtimes_before() = Timestamp(0, 0),
- n::image() = FSPath::cwd() / "vdb_merger_TEST_dir" / target / "image",
+ n::image() = FSPath::cwd() / "vdb_merger_TEST_dir" / (target + "_dir") / "image",
n::merged_entries() = std::make_shared<FSPathSet>(),
n::options() = MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs,
n::output_manager() = std::make_shared<StandardOutputManager>(),