libstdc++: Fix failing filesystem::path tests (PR 93244)

The checks for PR 93244 don't actually pass on Windows (which is the
target where the bug is present) because of a different bug, PR 94063.

This adjusts the tests to not be affected by 94063 so that they verify
that 93244 was fixed.

	PR libstdc++/93244
	* testsuite/27_io/filesystem/path/generic/generic_string.cc: Adjust
	test to not fail due to PR 94063.
	* testsuite/27_io/filesystem/path/generic/utf.cc: Likewise.
	* testsuite/27_io/filesystem/path/generic/wchar_t.cc: Likewise.
This commit is contained in:
Jonathan Wakely 2020-03-06 11:27:34 +00:00
parent 28119fba7f
commit 180eeeaeb2
4 changed files with 26 additions and 15 deletions

View File

@ -1,3 +1,11 @@
2020-03-06 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/93244
* testsuite/27_io/filesystem/path/generic/generic_string.cc: Adjust
test to not fail due to PR 94063.
* testsuite/27_io/filesystem/path/generic/utf.cc: Likewise.
* testsuite/27_io/filesystem/path/generic/wchar_t.cc: Likewise.
2020-03-06 Andreas Krebbel <krebbel@linux.ibm.com> 2020-03-06 Andreas Krebbel <krebbel@linux.ibm.com>
* src/c++11/system_error.cc: Omit the ENOTSUP case statement if it * src/c++11/system_error.cc: Omit the ENOTSUP case statement if it

View File

@ -49,11 +49,12 @@ test01()
void void
test02() test02()
{ {
// PR libstdc++/93244 if constexpr (path::preferred_separator == L'\\')
path p("C:"); {
p += path::preferred_separator; // PR libstdc++/93244
p += "foo/bar"; VERIFY( path("C:\\foo\\bar").generic_string() == "C:/foo/bar" );
VERIFY( p.generic_string() == "C:/foo/bar" ); VERIFY( path("C://foo//bar").generic_string() == "C:/foo/bar" );
}
} }
int int

View File

@ -49,11 +49,12 @@ test01()
void void
test02() test02()
{ {
// PR libstdc++/93244 if constexpr (path::preferred_separator == L'\\')
path p("C:"); {
p += path::preferred_separator; // PR libstdc++/93244
p += "foo/bar"; VERIFY( path("C:\\foo\\bar").generic_u32string() == U"C:/foo/bar" );
VERIFY( p.generic_u32string() == U"C:/foo/bar" ); VERIFY( path("C://foo//bar").generic_u32string() == U"C:/foo/bar" );
}
} }
int int

View File

@ -49,11 +49,12 @@ test01()
void void
test02() test02()
{ {
// PR libstdc++/93244 if constexpr (path::preferred_separator == L'\\')
path p("C:"); {
p += path::preferred_separator; // PR libstdc++/93244
p += "foo/bar"; VERIFY( path("C:\\foo\\bar").generic_wstring() == L"C:/foo/bar" );
VERIFY( p.generic_wstring() == L"C:/foo/bar" ); VERIFY( path("C://foo//bar").generic_wstring() == L"C:/foo/bar" );
}
} }
int int