diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-12-13 12:09:33 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-12-13 12:09:33 +0000 |
| commit | ebfaf345701abe17eae7757dd07ebc0c2955b0e6 (patch) | |
| tree | b6769eceb02cb382b6037e30284d25b1e46fe854 | |
| parent | a00ccce85885e1ddafe83c177dffa17cb7aff89d (diff) | |
| download | gcc-ebfaf345701abe17eae7757dd07ebc0c2955b0e6.zip gcc-ebfaf345701abe17eae7757dd07ebc0c2955b0e6.tar.gz gcc-ebfaf345701abe17eae7757dd07ebc0c2955b0e6.tar.bz2 | |
Fix test to work when path::native() returns wstring
* testsuite/27_io/filesystem/path/itr/traversal.cc: Fix test for
mingw.
From-SVN: r267089
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/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 9a7905f..3299f10 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2018-12-13 Jonathan Wakely <jwakely@redhat.com> + * 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 55760e8..d77e613 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 |