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

Fix failing prettyprinter test 

The failure for "p2" went unnoticed due to the pre-existing failures for
variables with similar names, like "p" and "q". This fixes the failure,
and gives the filesystem::path variables better names.

	* testsuite/libstdc++-prettyprinters/cxx17.cc: Fix expected output
	for filesystem::path. Give variables more distinctive names.

From-SVN: r267762
This commit is contained in:
Jonathan Wakely 2019-01-09 10:46:52 +00:00 committed by Jonathan Wakely
parent 50b0a3d672
commit d3c8a7cfdb
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,8 @@
2019-01-09 Jonathan Wakely <jwakely@redhat.com>
* testsuite/libstdc++-prettyprinters/cxx17.cc: Fix expected output
for filesystem::path. Give variables more distinctive names.
* include/std/optional (_Optional_payload_base::_M_copy_assign): New
member function to perform non-trivial assignment.
(_Optional_payload_base::_M_move_assign): Likewise.

12
libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc
View File

@ -124,12 +124,12 @@ main()
// { dg-final { regexp-test q {std::shared_ptr.int \[2\]. \(use count 2, weak count 1\) = {get\(\) = 0x.*}} } }
// { dg-final { regexp-test wq {std::weak_ptr.int \[2\]. \(use count 2, weak count 1\) = {get\(\) = 0x.*}} } }
std::filesystem::path p0;
// { dg-final { note-test p0 {filesystem::path ""} } }
std::filesystem::path p1("filename");
// { dg-final { note-test p1 {filesystem::path "filename"} } }
std::filesystem::path p2("/dir/.");
// { dg-final { note-test p2 {filesystem::path "/dir/file" = {[root-directory] = "/", [1] = "dir", [2] = "."}} } }
std::filesystem::path path0;
// { dg-final { note-test path0 {filesystem::path ""} } }
std::filesystem::path path1("filename");
// { dg-final { note-test path1 {filesystem::path "filename"} } }
std::filesystem::path path2("/dir/.");
// { dg-final { note-test path2 {filesystem::path "/dir/." = {[root-directory] = "/", [1] = "dir", [2] = "."}} } }
std::cout << "\n";
return 0; // Mark SPOT