summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2016-08-02 19:34:25 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2016-08-02 19:34:25 +0000
commitd864625c0157952258fc758398a04c44599ce89f (patch)
treeedc344e3352a7c456b38c2b0f263d5bda759f9a1
parent26eb32d549883d49531c50a4a6b1c0a4ef83982c (diff)
downloadgcc-d864625c0157952258fc758398a04c44599ce89f.tar.gz
Move dg-error directives to relevant lines
* testsuite/19_diagnostics/error_code/operators/bool_neg.cc: Move dg-error to relevant line. * testsuite/19_diagnostics/error_condition/operators/bool_neg.cc: Likewise. * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238994 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc4
-rw-r--r--libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc4
-rw-r--r--libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc9
4 files changed, 11 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 28618f3ee7d..4bb89fa2a1e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
2016-08-02 Jonathan Wakely <jwakely@redhat.com>
+ * testsuite/19_diagnostics/error_code/operators/bool_neg.cc: Move
+ dg-error to relevant line.
+ * testsuite/19_diagnostics/error_condition/operators/bool_neg.cc:
+ Likewise.
+ * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
+
* scripts/testsuite_flags.in: Add -fno-show-column to cxxflags.
* testsuite/18_support/bad_exception/23591_thread-1.c: Skip test if
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc
index 3088d7c361a..6b7d514202f 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_code/operators/bool_neg.cc
@@ -25,9 +25,7 @@
int main()
{
std::error_code e;
- int i = e;
+ int i = e; // { dg-error "cannot convert" }
return i;
}
-
-// { dg-error "cannot convert" "" { target *-*-* } 28 }
diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc
index 29115990544..ce45d7a1168 100644
--- a/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc
+++ b/libstdc++-v3/testsuite/19_diagnostics/error_condition/operators/bool_neg.cc
@@ -24,9 +24,7 @@
int test01()
{
std::error_condition e;
- int i = e;
+ int i = e; // { dg-error "cannot convert" }
return i;
}
-
-// { dg-error "cannot convert" "" { target *-*-* } 27 }
diff --git a/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc b/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc
index 5f3e68b1f1f..a101d2938a7 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc
@@ -31,24 +31,21 @@ test01()
void
test02()
{
- std::ratio<INTMAX_MIN, 1> r1 __attribute__((unused));
+ std::ratio<INTMAX_MIN, 1> r1 __attribute__((unused)); // { dg-error "required from here" }
}
void
test03()
{
- std::ratio<1, INTMAX_MIN> r1 __attribute__((unused));
+ std::ratio<1, INTMAX_MIN> r1 __attribute__((unused)); // { dg-error "required from here"
}
void
test04()
{
- std::ratio<1,0> r1 __attribute__((unused));
+ std::ratio<1,0> r1 __attribute__((unused)); // { dg-error "required from here"
}
-// { dg-error "required from here" "" { target *-*-* } 34 }
-// { dg-error "required from here" "" { target *-*-* } 40 }
-// { dg-error "required from here" "" { target *-*-* } 46 }
// { dg-error "denominator cannot be zero" "" { target *-*-* } 265 }
// { dg-error "out of range" "" { target *-*-* } 266 }
// { dg-error "overflow in constant expression" "" { target *-*-* } 61 }