diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-07-30 13:41:33 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-07-30 13:41:33 +0100 |
| commit | 155bfacbbeee09bc39465141fb7f47e309c31fb6 (patch) | |
| tree | 6a1a8f80eb59680031ada9f54b0608c03a8ceb56 | |
| parent | b21ce9ce3bc76be56a358bef9018f8a70f170450 (diff) | |
| download | gcc-155bfacbbeee09bc39465141fb7f47e309c31fb6.zip gcc-155bfacbbeee09bc39465141fb7f47e309c31fb6.tar.gz gcc-155bfacbbeee09bc39465141fb7f47e309c31fb6.tar.bz2 | |
current_path.cc: Use canonical paths for comparisons.
* testsuite/experimental/filesystem/operations/current_path.cc: Use
canonical paths for comparisons.
From-SVN: r226402
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/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 806d3d9..5f87ddd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2015-07-30 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/experimental/filesystem/operations/current_path.cc: Use + canonical paths for comparisons. + 2015-07-30 Tim Shen <timshen@google.com> * 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 325a5a8..c242ac0 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 |