aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-03 00:15:43 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-03 00:15:43 +0100
commite710a8015607d6c9404acc001312a5d82e436d8e (patch)
tree47d81b65d08f5cdca0ca401cf6c2b8c2dca2020c
parentb68aed63f615e1d9c82779009ed28130ca40f480 (diff)
downloadpaludis-e710a8015607d6c9404acc001312a5d82e436d8e.tar.gz
paludis-e710a8015607d6c9404acc001312a5d82e436d8e.tar.xz
Fix paths
-rw-r--r--paludis/fs_merger_TEST.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/fs_merger_TEST.cc b/paludis/fs_merger_TEST.cc
index f958c0f..d4afd41 100644
--- a/paludis/fs_merger_TEST.cc
+++ b/paludis/fs_merger_TEST.cc
@@ -175,7 +175,7 @@ namespace
n::no_chown() = true,
n::options() = MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs,
n::permit_destination() = std::bind(return_literal_function(true)),
- n::root() = root_dir
+ n::root() = root_dir.realpath()
))
{
}
@@ -197,7 +197,7 @@ namespace
n::no_chown() = true,
n::options() = o,
n::permit_destination() = std::bind(return_literal_function(true)),
- n::root() = root_dir
+ n::root() = root_dir.realpath()
))
{
}
@@ -470,7 +470,7 @@ TEST(Merger, EmptyRootDisallowed)
{
auto data(make_merger("empty_root_disallowed", { }));
ASSERT_TRUE(FSIterator(data->image_dir, { fsio_include_dotfiles, fsio_first_only }) == FSIterator());
- ASSERT_TRUE(! data->merger.check());
+ ASSERT_TRUE(data->merger.check());
}
TEST(Merger, Mtimes)