From 155bfacbbeee09bc39465141fb7f47e309c31fb6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 30 Jul 2015 13:41:33 +0100 Subject: [PATCH] current_path.cc: Use canonical paths for comparisons. * testsuite/experimental/filesystem/operations/current_path.cc: Use canonical paths for comparisons. From-SVN: r226402 --- libstdc++-v3/ChangeLog | 5 +++++ .../experimental/filesystem/operations/current_path.cc | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 806d3d9bab9..5f87dddaa6f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2015-07-30 Jonathan Wakely + + * testsuite/experimental/filesystem/operations/current_path.cc: Use + canonical paths for comparisons. + 2015-07-30 Tim Shen * include/bits/regex_automaton.h (_State_base, _State<>): diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/current_path.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/current_path.cc index 325a5a852fd..c242ac0e399 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/current_path.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/current_path.cc @@ -42,11 +42,11 @@ test02() auto oldwd = fs::current_path(); auto tmpdir = fs::temp_directory_path(); current_path(tmpdir); - VERIFY( fs::current_path() == tmpdir ); + VERIFY( canonical(fs::current_path()) == canonical(tmpdir) ); std::error_code ec; current_path(oldwd, ec); - VERIFY( fs::current_path() == oldwd ); - VERIFY( fs::current_path(ec) == oldwd ); + VERIFY( canonical(fs::current_path()) == canonical(oldwd) ); + VERIFY( canonical(fs::current_path(ec)) == canonical(oldwd) ); } int