aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2018-10-16 12:06:05 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2018-10-16 12:06:05 +0000
commit21e53b9c5ca59ba965be80d014af6e61e977ba7d (patch)
tree4fb02e3039b11c7688cdc2074a4a2c93136338ed
parent1960379cd87e4e394ebcdb628a868e928056ac71 (diff)
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@265190 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/20_util/duration/literals/range_neg.cc2
-rw-r--r--libstdc++-v3/testsuite/23_containers/deque/capacity/max_size.cc2
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/capacity/max_size.cc2
4 files changed, 11 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1b4179ee6d5..2f64fea7cf8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
2018-10-16 Jonathan Wakely <jwakely@redhat.com>
+ * 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.
+
PR libstdc++/87618
* config/abi/pre/gnu.ver: Fix typos in patterns for basic_stringbuf.
* testsuite/27_io/basic_stringbuf/cons/char/default.cc: Disable
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; }