This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [patch] Some testsuite cleanup


On 28/07/16 22:06 +0100, Jonathan Wakely wrote:
The dg-prune-output directives in these tests are needed to prune some
additional errors that are only issued in C++98 mode, but the line
numbers had got out of date. I've replaced the hardcoded numbers with
strings that will stay valid.

  Fix DR 438 container tests to pass in C++98 mode
      * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
      Adjust dg-prune-output pattern for error in C++98 mode.
      * testsuite/23_containers/deque/requirements/dr438/
      constructor_1_neg.cc: Likewise.
      * testsuite/23_containers/deque/requirements/dr438/
      constructor_2_neg.cc: Likewise.
      * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
      Likewise.
      * testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
      Likewise.
      * testsuite/23_containers/list/requirements/dr438/
      constructor_1_neg.cc: Likewise.
      * testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
      Likewise.
      * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
      Likewise.
      * testsuite/23_containers/vector/requirements/dr438/
      constructor_1_neg.cc: Likewise.
      * testsuite/23_containers/vector/requirements/dr438/
      constructor_2_neg.cc: Likewise.
      * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
      Likewise.

I missed one test in the change above. For that test the extra error
in C++98 mode comes from location 1698:29 which doesn't match the 1682
lineno in the test, but instead matches the dg-error on line 29 of the
file. That means it fails if it's run with
--target_board=unix/-fno-show-column/-std=gnu++98

(I'm getting really annoyed with line numbers matching columns!)

Tested x86_64-linux, committed to trunk.


commit c9949d54ba1ff875802947e7e7bba63a9a2e1164
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Sun Jul 31 19:58:46 2016 +0100

    Fix DR 438 std::list test to pass in C++98 mode
    
    	* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
    	Adjust dg-prune-output pattern for error in C++98 mode.

diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc
index 313c54a..769d615 100644
--- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-prune-output 1682 }
+// { dg-prune-output "no matching function .*_M_fill_initialize" }
 
 #include <list>
 #include <utility>

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]