* testsuite/20_util/duration/literals/range_neg.cc: Adjust pruned
        diagnostic to account for quotes around 'constexpr'.
        * testsuite/23_containers/deque/capacity/max_size.cc: Define static
        variable.
        * testsuite/23_containers/vector/capacity/max_size.cc: Likewise.

Tested x86_64-linux, committed to trunk.

commit cea66d7e4067fd6d44b3834e5a8b9caaf3e8caa4
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Tue Oct 16 12:08:57 2018 +0100

    Fix tests that fail when compiled without optimisation
    
            * testsuite/20_util/duration/literals/range_neg.cc: Adjust pruned
            diagnostic to account for quotes around 'constexpr'.
            * testsuite/23_containers/deque/capacity/max_size.cc: Define static
            variable.
            * testsuite/23_containers/vector/capacity/max_size.cc: Likewise.

diff --git a/libstdc++-v3/testsuite/20_util/duration/literals/range_neg.cc 
b/libstdc++-v3/testsuite/20_util/duration/literals/range_neg.cc
index f28f2f6a4e8..7b76ecb1460 100644
--- a/libstdc++-v3/testsuite/20_util/duration/literals/range_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/literals/range_neg.cc
@@ -28,4 +28,4 @@ test01()
   auto h = 9223372036854775808h;
   // { dg-error "cannot be represented" "" { target *-*-* } 908 }
 }
-// { dg-prune-output "in constexpr expansion" } // needed for -O0
+// { dg-prune-output "in .constexpr. expansion" } // needed for -O0
diff --git a/libstdc++-v3/testsuite/23_containers/deque/capacity/max_size.cc 
b/libstdc++-v3/testsuite/23_containers/deque/capacity/max_size.cc
index 1a38c4ed698..99160700cff 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/capacity/max_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/capacity/max_size.cc
@@ -121,6 +121,8 @@ private:
   static const char value = 'x';
 };
 
+const char Iter::value;
+
 Iter operator+(Iter i, Iter::difference_type n) { return i += n; }
 Iter operator+(Iter::difference_type n, Iter i) { return i += n; }
 Iter operator-(Iter::difference_type n, Iter i) { return i -= n; }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/max_size.cc 
b/libstdc++-v3/testsuite/23_containers/vector/capacity/max_size.cc
index 34d3c4ab96e..bde4c10ac92 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/max_size.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/max_size.cc
@@ -121,6 +121,8 @@ private:
   static const char value = 'x';
 };
 
+const char Iter::value;
+
 Iter operator+(Iter i, Iter::difference_type n) { return i += n; }
 Iter operator+(Iter::difference_type n, Iter i) { return i += n; }
 Iter operator-(Iter::difference_type n, Iter i) { return i -= n; }

Reply via email to