From 6037ebeff1cd76385e88dd9cbcaf68ada85316fb Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sat, 26 Dec 2020 19:46:50 +0000 Subject: [PATCH] Objective-C++ : Fix up testcase EOF diagnostics. Some Objective-C++ testcases need modification in reponse to the solution to PR 96045. gcc/testsuite/ChangeLog: PR c++/96045 * obj-c++.dg/property/property-neg-6.mm: Adjust EOF diagnostic location. * obj-c++.dg/syntax-error-10.mm: Likewise. * obj-c++.dg/syntax-error-8.mm: Likewise. * obj-c++.dg/syntax-error-9.mm: Likewise. --- gcc/testsuite/obj-c++.dg/property/property-neg-6.mm | 2 +- gcc/testsuite/obj-c++.dg/syntax-error-10.mm | 2 +- gcc/testsuite/obj-c++.dg/syntax-error-8.mm | 2 +- gcc/testsuite/obj-c++.dg/syntax-error-9.mm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/obj-c++.dg/property/property-neg-6.mm b/gcc/testsuite/obj-c++.dg/property/property-neg-6.mm index 1db6f0ba1b8..c4a22eb6d20 100644 --- a/gcc/testsuite/obj-c++.dg/property/property-neg-6.mm +++ b/gcc/testsuite/obj-c++.dg/property/property-neg-6.mm @@ -6,4 +6,4 @@ int iVar; } @property int FooBar /* { dg-error "expected ';' at end of input" } */ - /* { dg-error "-:expected '@end' at end of input" "" { target *-*-* } .+1 } */ + /* { dg-error "expected '@end' at end of input" "" { target *-*-* } .-1 } */ diff --git a/gcc/testsuite/obj-c++.dg/syntax-error-10.mm b/gcc/testsuite/obj-c++.dg/syntax-error-10.mm index 6fcf96f769e..f8e0c50b146 100644 --- a/gcc/testsuite/obj-c++.dg/syntax-error-10.mm +++ b/gcc/testsuite/obj-c++.dg/syntax-error-10.mm @@ -1,2 +1,2 @@ @interface -/* { dg-error "-:expected identifier" "" { target *-*-* } .+1 } */ +/* { dg-error "expected identifier" "" { target *-*-* } .-1 } */ diff --git a/gcc/testsuite/obj-c++.dg/syntax-error-8.mm b/gcc/testsuite/obj-c++.dg/syntax-error-8.mm index f7cfe0e0895..c13303fb775 100644 --- a/gcc/testsuite/obj-c++.dg/syntax-error-8.mm +++ b/gcc/testsuite/obj-c++.dg/syntax-error-8.mm @@ -1 +1 @@ -@interface A /* { dg-error "-:expected ..end." "" { target *-*-* } .+1 } */ +@interface A /* { dg-error "expected ..end." "" { target *-*-* } .-1 } */ diff --git a/gcc/testsuite/obj-c++.dg/syntax-error-9.mm b/gcc/testsuite/obj-c++.dg/syntax-error-9.mm index ad8837c28af..e1f8bd17550 100644 --- a/gcc/testsuite/obj-c++.dg/syntax-error-9.mm +++ b/gcc/testsuite/obj-c++.dg/syntax-error-9.mm @@ -1,4 +1,4 @@ // { dg-additional-options "-Wno-objc-root-class" } @implementation SaturnDoc /* { dg-warning "cannot find interface declaration" } */ - read: (void*)aStream ggg /* { dg-error "expected .:. at end of input" } */ -/* { dg-error "-:expected ..*. at end of input" "" { target *-*-* } .+1 } */ +/* { dg-error "expected ..*. at end of input" "" { target *-*-* } .-1 } */ -- 2.30.2