aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Piotr Jaroszyński <peper@gentoo.org> 2007-05-24 14:56:38 +0000
committerAvatar Piotr Jaroszyński <peper@gentoo.org> 2007-05-24 14:56:38 +0000
commit3741d5bc04b6bc2bd89be72735d3bb371da51aa6 (patch)
tree906b22713553bca397247925be9ff1bc4b6b7d93
parentcf616f5e930fafe86d91915d7c90a04118916380 (diff)
downloadpaludis-3741d5bc04b6bc2bd89be72735d3bb371da51aa6.tar.gz
paludis-3741d5bc04b6bc2bd89be72735d3bb371da51aa6.tar.xz
Don't use "force" in merger_TEST as merger cannot be forced to merge.
-rw-r--r--paludis/merger/merger_TEST.cc12
-rwxr-xr-xpaludis/merger/merger_TEST_setup.sh6
2 files changed, 9 insertions, 9 deletions
diff --git a/paludis/merger/merger_TEST.cc b/paludis/merger/merger_TEST.cc
index c812df5..e192587 100644
--- a/paludis/merger/merger_TEST.cc
+++ b/paludis/merger/merger_TEST.cc
@@ -430,22 +430,22 @@ namespace test_cases
void run()
{
TEST_CHECK((image_dir / "dir_skip_me").is_directory());
- TEST_CHECK((image_dir / "dir_force_me").is_directory());
+ TEST_CHECK((image_dir / "dir_install_me").is_directory());
TEST_CHECK((image_dir / "file_skip_me").is_regular_file());
- TEST_CHECK((image_dir / "file_force_me").is_regular_file());
+ TEST_CHECK((image_dir / "file_install_me").is_regular_file());
TEST_CHECK((image_dir / "sym_skip_me").is_symbolic_link());
- TEST_CHECK((image_dir / "sym_force_me").is_symbolic_link());
+ TEST_CHECK((image_dir / "sym_install_me").is_symbolic_link());
TEST_CHECK(merger.check());
merger.merge();
TEST_CHECK(! (root_dir / "dir_skip_me").exists());
- TEST_CHECK((root_dir / "dir_force_me").is_directory());
+ TEST_CHECK((root_dir / "dir_install_me").is_directory());
TEST_CHECK(! (root_dir / "file_skip_me").exists());
- TEST_CHECK((root_dir / "file_force_me").is_regular_file());
+ TEST_CHECK((root_dir / "file_install_me").is_regular_file());
TEST_CHECK(! (root_dir / "sym_skip_me").exists());
- TEST_CHECK((root_dir / "sym_force_me").is_symbolic_link());
+ TEST_CHECK((root_dir / "sym_install_me").is_symbolic_link());
}
} test_merger_override;
}
diff --git a/paludis/merger/merger_TEST_setup.sh b/paludis/merger/merger_TEST_setup.sh
index f8597ab..12fb678 100755
--- a/paludis/merger/merger_TEST_setup.sh
+++ b/paludis/merger/merger_TEST_setup.sh
@@ -73,11 +73,11 @@ mkdir root_file_over_dir/file
mkdir image_override root_override
mkdir image_override/dir_skip_me/
-mkdir image_override/dir_force_me/
+mkdir image_override/dir_install_me/
> image_override/file_skip_me
-> image_override/file_force_me
+> image_override/file_install_me
ln -s image_override/file_skip_me image_override/sym_skip_me
-ln -s image_override/file_force_me image_override/sym_force_me
+ln -s image_override/file_install_me image_override/sym_install_me
mkdir hooks