OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix [fs.path.gen] tests to use backslashes for mingw 

The normalized paths contain backslashes so fix the expected values to
use backslashes too.

	* testsuite/27_io/filesystem/path/generation/proximate.cc: Use
	preferred directory separators for normalized paths.
	* testsuite/27_io/filesystem/path/generation/relative.cc: Likewise.

From-SVN: r267090
This commit is contained in:
Jonathan Wakely 2018-12-13 12:26:52 +00:00 committed by Jonathan Wakely
parent ebfaf34570
commit a7a6c14a55
3 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,9 @@
2018-12-13 Jonathan Wakely <jwakely@redhat.com>
* testsuite/27_io/filesystem/path/generation/proximate.cc: Use
preferred directory separators for normalized paths.
* testsuite/27_io/filesystem/path/generation/relative.cc: Likewise.
* testsuite/27_io/filesystem/path/itr/traversal.cc: Fix test for
mingw.

27
libstdc++-v3/testsuite/27_io/filesystem/path/generation/proximate.cc
View File

@ -26,16 +26,28 @@
using std::filesystem::path;
using __gnu_test::compare_paths;
// Normalize directory-separators
std::string operator""_norm(const char* s, std::size_t n)
{
std::string str(s, n);
#if defined(__MING32__) || defined(__MINGW64__)
for (auto& c : str)
if (c == '/')
c = '\\';
#endif
return str;
}
void
test01()
{
// C++17 [fs.path.gen] p5
compare_paths( path("/a/d").lexically_proximate("/a/b/c"), "../../d" );
compare_paths( path("/a/b/c").lexically_proximate("/a/d"), "../b/c" );
compare_paths( path("a/b/c").lexically_proximate("a"), "b/c" );
compare_paths( path("a/b/c").lexically_proximate("a/b/c/x/y"), "../.." );
compare_paths( path("a/b/c").lexically_proximate("a/b/c"), "." );
compare_paths( path("a/b").lexically_proximate("c/d"), "../../a/b" );
compare_paths( path("/a/d").lexically_proximate("/a/b/c"), "../../d"_norm );
compare_paths( path("/a/b/c").lexically_proximate("/a/d"), "../b/c"_norm );
compare_paths( path("a/b/c").lexically_proximate("a"), "b/c"_norm );
compare_paths( path("a/b/c").lexically_proximate("a/b/c/x/y"), "../.."_norm );
compare_paths( path("a/b/c").lexically_proximate("a/b/c"), "."_norm );
compare_paths( path("a/b").lexically_proximate("c/d"), "../../a/b"_norm );
}
void
@ -43,7 +55,8 @@ test02()
{
path p = "a/b/c";
compare_paths( p.lexically_proximate(p), "." );
compare_paths( p.lexically_proximate("a/../a/b/../b/c/../c/."), "../../b/c" );
compare_paths( p.lexically_proximate("a/../a/b/../b/c/../c/."),
"../../b/c"_norm );
compare_paths( p.lexically_proximate("../../../"), p );
}

26
libstdc++-v3/testsuite/27_io/filesystem/path/generation/relative.cc
View File

@ -26,16 +26,28 @@
using std::filesystem::path;
using __gnu_test::compare_paths;
// Normalize directory-separators
std::string operator""_norm(const char* s, std::size_t n)
{
std::string str(s, n);
#if defined(__MING32__) || defined(__MINGW64__)
for (auto& c : str)
if (c == '/')
c = '\\';
#endif
return str;
}
void
test01()
{
// C++17 [fs.path.gen] p5
compare_paths( path("/a/d").lexically_relative("/a/b/c"), "../../d" );
compare_paths( path("/a/b/c").lexically_relative("/a/d"), "../b/c" );
compare_paths( path("a/b/c").lexically_relative("a"), "b/c" );
compare_paths( path("a/b/c").lexically_relative("a/b/c/x/y"), "../.." );
compare_paths( path("/a/d").lexically_relative("/a/b/c"), "../../d"_norm );
compare_paths( path("/a/b/c").lexically_relative("/a/d"), "../b/c"_norm );
compare_paths( path("a/b/c").lexically_relative("a"), "b/c"_norm );
compare_paths( path("a/b/c").lexically_relative("a/b/c/x/y"), "../.."_norm );
compare_paths( path("a/b/c").lexically_relative("a/b/c"), "." );
compare_paths( path("a/b").lexically_relative("c/d"), "../../a/b" );
compare_paths( path("a/b").lexically_relative("c/d"), "../../a/b"_norm );
}
void
@ -43,10 +55,10 @@ test02()
{
path p = "a/b/c";
compare_paths( p.lexically_relative(p), "." );
compare_paths( p.lexically_relative("a/../a/b/../b/c/../c/."), "../../b/c" );
compare_paths( p.lexically_relative("a/../a/b/../b/c/../c/."), "../../b/c"_norm );
compare_paths( p.lexically_relative("../../../"), "" );
compare_paths( path("a/./.").lexically_relative("a"), "./." );
compare_paths( path("a/./.").lexically_relative("a"), "./."_norm );
}
void