aboutsummaryrefslogtreecommitdiff
path: root/paludis/broken_linkage_configuration_TEST.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/broken_linkage_configuration_TEST.cc')
-rw-r--r--paludis/broken_linkage_configuration_TEST.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/paludis/broken_linkage_configuration_TEST.cc b/paludis/broken_linkage_configuration_TEST.cc
index d050772..a356821 100644
--- a/paludis/broken_linkage_configuration_TEST.cc
+++ b/paludis/broken_linkage_configuration_TEST.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/broken_linkage_configuration.hh>
-#include <paludis/util/fs_entry.hh>
+#include <paludis/util/fs_path.hh>
#include <paludis/util/join.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
@@ -43,19 +43,19 @@ namespace test_cases
setenv("SEARCH_DIRS_MASK", "/quuxlib/quux", 1);
setenv("LD_LIBRARY_MASK", "libquux.so", 1);
- BrokenLinkageConfiguration config(FSEntry::cwd() / "broken_linkage_configuration_TEST_dir");
+ BrokenLinkageConfiguration config(FSPath::cwd() / "broken_linkage_configuration_TEST_dir");
TEST_CHECK_EQUAL(join(config.begin_search_dirs(), config.end_search_dirs(), " "),
"/42 /alib /barbin /barlib/foo /bazbin /bin /blib /fhqwhgads1 /fhqwhgads2 /foobin /foolib/bar /hwdp foobar /lib32 /lib64 /quuxlib /qwerty1 /qwerty2 /sbin /uiop1 /uiop2 /usr/bin /usr/lib* /usr/sbin");
TEST_CHECK_EQUAL(join(config.begin_ld_so_conf(), config.end_ld_so_conf(), " "),
"/42 /barlib/foo /fhqwhgads1 /fhqwhgads2 /foolib/bar /lib /qwerty1 /qwerty2 /uiop1 /uiop2 /usr/lib hwdp foobar");
- TEST_CHECK(config.dir_is_masked(FSEntry("/meh")));
- TEST_CHECK(config.dir_is_masked(FSEntry("/quuxlib/quux")));
- TEST_CHECK(! config.dir_is_masked(FSEntry("/feh")));
- TEST_CHECK(! config.dir_is_masked(FSEntry("/opt/OpenOffice")));
- TEST_CHECK(! config.dir_is_masked(FSEntry("/usr/lib/openoffice")));
- TEST_CHECK(! config.dir_is_masked(FSEntry("/foo")));
+ TEST_CHECK(config.dir_is_masked(FSPath("/meh")));
+ TEST_CHECK(config.dir_is_masked(FSPath("/quuxlib/quux")));
+ TEST_CHECK(! config.dir_is_masked(FSPath("/feh")));
+ TEST_CHECK(! config.dir_is_masked(FSPath("/opt/OpenOffice")));
+ TEST_CHECK(! config.dir_is_masked(FSPath("/usr/lib/openoffice")));
+ TEST_CHECK(! config.dir_is_masked(FSPath("/foo")));
TEST_CHECK(config.lib_is_masked("libquux.so"));
TEST_CHECK(config.lib_is_masked("libxyzzy.so"));