aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/fish_tests.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2016-02-17 16:25:19 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2016-02-18 17:00:26 -0800
commit43e1c0a2bf0898a23950c740de9fcba2991f1aaf (patch)
treea05a6c85a4e64391eb3aad2d03fd3d85de442943 /src/fish_tests.cpp
parent99e18d9cef17a9e5ef3b0cefc88c2f8f54c38bf5 (diff)
Remove some newly dead code
out_suggested_cdpath is no longer required from is_potential_path
Diffstat (limited to 'src/fish_tests.cpp')
-rw-r--r--src/fish_tests.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index cd1c0b60..9be273e6 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1929,25 +1929,24 @@ static void test_is_potential_path()
const wcstring wd = L"/tmp/is_potential_path_test/";
const wcstring_list_t wds(1, wd);
- wcstring tmp;
- do_test(is_potential_path(L"al", wds, PATH_REQUIRE_DIR, &tmp) && tmp == L"alpha/");
- do_test(is_potential_path(L"alpha/", wds, PATH_REQUIRE_DIR, &tmp) && tmp == L"alpha/");
+ do_test(is_potential_path(L"al", wds, PATH_REQUIRE_DIR));
+ do_test(is_potential_path(L"alpha/", wds, PATH_REQUIRE_DIR));
do_test(is_potential_path(L"aard", wds, 0));
- do_test(! is_potential_path(L"balpha/", wds, PATH_REQUIRE_DIR, &tmp));
- do_test(! is_potential_path(L"aard", wds, PATH_REQUIRE_DIR, &tmp));
- do_test(! is_potential_path(L"aarde", wds, PATH_REQUIRE_DIR, &tmp));
- do_test(! is_potential_path(L"aarde", wds, 0, &tmp));
+ do_test(! is_potential_path(L"balpha/", wds, PATH_REQUIRE_DIR));
+ do_test(! is_potential_path(L"aard", wds, PATH_REQUIRE_DIR));
+ do_test(! is_potential_path(L"aarde", wds, PATH_REQUIRE_DIR));
+ do_test(! is_potential_path(L"aarde", wds, 0));
do_test(is_potential_path(L"/tmp/is_potential_path_test/aardvark", wds, 0));
- do_test(is_potential_path(L"/tmp/is_potential_path_test/al", wds, PATH_REQUIRE_DIR, &tmp) && tmp == L"/tmp/is_potential_path_test/alpha/");
+ do_test(is_potential_path(L"/tmp/is_potential_path_test/al", wds, PATH_REQUIRE_DIR));
do_test(is_potential_path(L"/tmp/is_potential_path_test/aardv", wds, 0));
- do_test(! is_potential_path(L"/tmp/is_potential_path_test/aardvark", wds, PATH_REQUIRE_DIR, &tmp));
- do_test(! is_potential_path(L"/tmp/is_potential_path_test/al/", wds, 0, &tmp));
- do_test(! is_potential_path(L"/tmp/is_potential_path_test/ar", wds, 0, &tmp));
+ do_test(! is_potential_path(L"/tmp/is_potential_path_test/aardvark", wds, PATH_REQUIRE_DIR));
+ do_test(! is_potential_path(L"/tmp/is_potential_path_test/al/", wds, 0));
+ do_test(! is_potential_path(L"/tmp/is_potential_path_test/ar", wds, 0));
- do_test(is_potential_path(L"/usr", wds, PATH_REQUIRE_DIR, &tmp) && tmp == L"/usr/");
+ do_test(is_potential_path(L"/usr", wds, PATH_REQUIRE_DIR));
}