diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-01-09 10:46:52 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-01-09 10:46:52 +0000 |
| commit | d3c8a7cfdbe30993cc051deba0a93f2f541ab88b (patch) | |
| tree | d478cfe54c8d5ef689835c2f956a711438161721 /libstdc++-v3 | |
| parent | 50b0a3d672fba49a69056e4a70fcc318d8d4c7df (diff) | |
| download | gcc-d3c8a7cfdbe30993cc051deba0a93f2f541ab88b.zip gcc-d3c8a7cfdbe30993cc051deba0a93f2f541ab88b.tar.gz gcc-d3c8a7cfdbe30993cc051deba0a93f2f541ab88b.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d0f060d..4258c8d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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. diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc index c550cbd..4ed4d47 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx17.cc @@ -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 |