mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 04:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix filesystem::path tests

Browse Source 
The root_path.cc test had some debugging macros left in accidentally, so
didn't FAIL correctly if an assertion failed.

The string-char8_t.cc tests didn't compile on Windows.

	* testsuite/27_io/filesystem/path/decompose/root_path.cc: Remove
	macros accidentally left in.
	* testsuite/27_io/filesystem/path/native/string-char8_t.cc: Remove
	unnecessary -lstdc++fs option. Fix test for mingw.
	* testsuite/experimental/filesystem/path/native/string-char8_t.cc:
	Fix test for mingw.

From-SVN: r270685
This commit is contained in:
Jonathan Wakely 2019-04-30 11:39:59 +01:00 committed by Jonathan Wakely
parent 0d67a51060
commit 95767c6597
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2019-04-30 Jonathan Wakely <jwakely@redhat.com>
* testsuite/27_io/filesystem/path/decompose/root_path.cc: Remove
macros accidentally left in.
* testsuite/27_io/filesystem/path/native/string-char8_t.cc: Remove
unnecessary -lstdc++fs option. Fix test for mingw.
* testsuite/experimental/filesystem/path/native/string-char8_t.cc:
Fix test for mingw.
2019-04-30 Jakub Jelinek <jakub@redhat.com>
* config/abi/post/riscv64-linux-gnu/baseline_symbols.txt: Update.

5
libstdc++-v3/testsuite/27_io/filesystem/path/decompose/root_path.cc
View File

@ -35,10 +35,6 @@ test01()
VERIFY( p2.root_path() == path("/") );
}
#undef VERIFY
#define VERIFY(X) do { if (!(X)) { __builtin_puts("FAIL: " #X); } } while(false)
#define DUMP(X, Y, Z) do { if (!(Y == Z)) { __builtin_printf("%s %s %s\n", X.c_str(), Y.c_str(), Z.c_str()); } } while(false)
void
test02()
{
@ -48,7 +44,6 @@ test02()
path rootn = p.root_name();
path rootd = p.root_directory();
VERIFY( rootp == (rootn / rootd) );
DUMP(p, rootp , (rootn / rootd) );
}
}

9
libstdc++-v3/testsuite/27_io/filesystem/path/native/string-char8_t.cc
View File

@ -15,7 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++17 -lstdc++fs -fchar8_t" }
// { dg-options "-std=gnu++17 -fchar8_t" }
// { dg-do run { target c++17 } }
// { dg-require-filesystem-ts "" }
@ -27,14 +27,15 @@ void
test01()
{
using namespace std::filesystem;
const std::string s = "abc";
using string_type = std::basic_string<path::value_type>;
const string_type s{ 'a', 'b', 'c' };
path p(s);
VERIFY( p.native() == s );
VERIFY( p.c_str() == s );
VERIFY( static_cast<std::string>(p) == s );
VERIFY( static_cast<string_type>(p) == s );
std::string s2 = p; // implicit conversion
string_type s2 = p; // implicit conversion
VERIFY( s2 == p.native() );
}

7
libstdc++-v3/testsuite/experimental/filesystem/path/native/string-char8_t.cc
View File

@ -27,14 +27,15 @@ void
test01()
{
using namespace std::experimental::filesystem;
const std::string s = "abc";
using string_type = std::basic_string<path::value_type>;
const string_type s{ 'a', 'b', 'c' };
path p(s);
VERIFY( p.native() == s );
VERIFY( p.c_str() == s );
VERIFY( static_cast<std::string>(p) == s );
VERIFY( static_cast<string_type>(p) == s );
std::string s2 = p; // implicit conversion
string_type s2 = p; // implicit conversion
VERIFY( s2 == p.native() );
}