Author: ericwf Date: Mon Apr 2 18:52:12 2018 New Revision: 329038 URL: http://llvm.org/viewvc/llvm-project?rev=329038&view=rev Log: Fix fs::proximate tests on platforms where /net exists.
The proximate tests depended on `/net` not being a valid path, however, on OS X it is. Correct the tests to handle this. Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.proximate/proximate.pass.cpp Modified: libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.proximate/proximate.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.proximate/proximate.pass.cpp?rev=329038&r1=329037&r2=329038&view=diff ============================================================================== --- libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.proximate/proximate.pass.cpp (original) +++ libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.proximate/proximate.pass.cpp Mon Apr 2 18:52:12 2018 @@ -79,10 +79,10 @@ TEST_CASE(basic_test) { {"a", "/", relative_cwd / "a"}, {"a/b", "/", relative_cwd / "a/b"}, {"a", "/net", ".." / relative_cwd / "a"}, - {"//net/", "//net", "/net/"}, - {"//net", "//net/", ".."}, - {"//net", "//net", "."}, - {"//net/", "//net/", "."}, + {"//foo/", "//foo", "/foo/"}, + {"//foo", "//foo/", ".."}, + {"//foo", "//foo", "."}, + {"//foo/", "//foo/", "."}, {"//base", "a", dot_dot_to_root / "../base"}, {"a", "a", "."}, {"a/b", "a/b", "."}, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits