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.

From-SVN: r238994

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 28618f3ee7dc6b65bd1b3c39b79fc87de433efab..4bb89fa2a1e2a8e1334c3281ceac6792ae21fe3b 100644 (file)
--- 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 3088d7c361a586e082dab9cde86533570a92b41c..6b7d514202f3a3febf19c69a70c30fece7549502 100644 (file)
--- 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 29115990544d5dba9f6d4fe9f1e164c6e15f6fea..ce45d7a11686fafe65bd8ba949a4b149680776ce 100644 (file)
--- 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 5f3e68b1f1fcb73f1c4b4af53f6eace8085699ca..a101d2938a798324a56fb0ba4e503a9e66b30001 100644 (file)
--- 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 }