aboutsummaryrefslogtreecommitdiff
path: root/paludis/fs_merger_TEST.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/fs_merger_TEST.cc')
-rw-r--r--paludis/fs_merger_TEST.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/paludis/fs_merger_TEST.cc b/paludis/fs_merger_TEST.cc
index 5b63ca3d3..3b1fc0685 100644
--- a/paludis/fs_merger_TEST.cc
+++ b/paludis/fs_merger_TEST.cc
@@ -176,7 +176,8 @@ namespace
n::options() = MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs,
n::parts() = nullptr,
n::permit_destination() = std::bind(return_literal_function(true)),
- n::root() = root_dir.realpath()
+ n::root() = root_dir.realpath(),
+ n::should_merge() = nullptr
))
{
}
@@ -200,7 +201,8 @@ namespace
n::options() = o,
n::parts() = nullptr,
n::permit_destination() = std::bind(return_literal_function(true)),
- n::root() = root_dir.realpath()
+ n::root() = root_dir.realpath(),
+ n::should_merge() = nullptr
))
{
}