aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2014-07-30 18:05:46 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2014-07-30 18:05:46 +0200
commit3fa699d1d32f6592c8f11ac285914aca865ec289 (patch)
treea9750ac0b320ac71c99d6120cf6d8c4055a53a3e /gcc/testsuite
parent72b4f1fc78acca3168f821caa3d347f430619f8f (diff)
downloadgcc-3fa699d1d32f6592c8f11ac285914aca865ec289.zip
gcc-3fa699d1d32f6592c8f11ac285914aca865ec289.tar.gz
gcc-3fa699d1d32f6592c8f11ac285914aca865ec289.tar.bz2
* gnat.dg/case_null.adb, gnat.dg/specs/debug1.ads: Adjust tests.
From-SVN: r213303
Diffstat (limited to 'gcc/testsuite')
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gnat.dg/case_null.adb2
-rw-r--r--gcc/testsuite/gnat.dg/specs/debug1.ads2
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a334ad7..d0e5f26 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-30 Arnaud Charlet <charlet@adacore.com>
+
+ * gnat.dg/case_null.adb, gnat.dg/specs/debug1.ads: Adjust tests.
+
2014-07-30 Tom Tromey <tromey@redhat.com>
PR c/59855
@@ -7,6 +11,7 @@
* g++.dg/ipa/devirt-34.C: New testcase.
+>>>>>>> .r213302
2014-07-28 Richard Biener <rguenther@suse.de>
PR rtl-optimization/61801
diff --git a/gcc/testsuite/gnat.dg/case_null.adb b/gcc/testsuite/gnat.dg/case_null.adb
index eba89dc..4b1b30e 100644
--- a/gcc/testsuite/gnat.dg/case_null.adb
+++ b/gcc/testsuite/gnat.dg/case_null.adb
@@ -5,7 +5,7 @@ package body Case_Null is
procedure P1 (X : T) is
begin
case X is
- when S1 =>
+ when S1 => -- { dg-error "not.*static" }
null;
when e =>
null;
diff --git a/gcc/testsuite/gnat.dg/specs/debug1.ads b/gcc/testsuite/gnat.dg/specs/debug1.ads
index 2fdc6e1..1760eff7 100644
--- a/gcc/testsuite/gnat.dg/specs/debug1.ads
+++ b/gcc/testsuite/gnat.dg/specs/debug1.ads
@@ -11,4 +11,4 @@ package Debug1 is
end Debug1;
--- { dg-final { scan-assembler-times "DW_AT_artificial" 8 } }
+-- { dg-final { scan-assembler-times "DW_AT_artificial" 13 } }