From 13c991350d84c3b6bf450f8016a503de282f8cfd Mon Sep 17 00:00:00 2001 From: redi Date: Thu, 13 Dec 2018 12:09:33 +0000 Subject: [PATCH] Fix test to work when path::native() returns wstring * testsuite/27_io/filesystem/path/itr/traversal.cc: Fix test for mingw. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@267089 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 3 +++ .../testsuite/27_io/filesystem/path/itr/traversal.cc | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9a7905f1f167..3299f104153c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2018-12-13 Jonathan Wakely + * testsuite/27_io/filesystem/path/itr/traversal.cc: Fix test for + mingw. + * testsuite/27_io/filesystem/path/construct/80762.cc: Skip test if the Filesystem TS support is not configured. * testsuite/experimental/filesystem/path/construct/80762.cc: Likewise. diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/itr/traversal.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/itr/traversal.cc index 55760e82a9ad..d77e613ee535 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/itr/traversal.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/itr/traversal.cc @@ -144,13 +144,13 @@ test04() auto it = p.begin(); std::advance(it, 1); VERIFY( std::distance(p.begin(), it) == 1 ); - VERIFY( it->native() == "a" ); + VERIFY( it->string() == "a" ); std::advance(it, 3); VERIFY( std::distance(p.begin(), it) == 4 ); - VERIFY( it->native() == "d" ); + VERIFY( it->string() == "d" ); std::advance(it, -2); VERIFY( std::distance(p.begin(), it) == 2 ); - VERIFY( it->native() == "b" ); + VERIFY( it->string() == "b" ); } int -- 2.47.3