[committed] testsuite: Fix up pr107397.f90 test [PR107397]

Message ID Y6A9BBI4OAIb0s9a@tucnak
State Unresolved
Headers
Series [committed] testsuite: Fix up pr107397.f90 test [PR107397] |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Jakub Jelinek Dec. 19, 2022, 10:29 a.m. UTC
  On Sat, Dec 17, 2022 at 09:12:43AM -0800, Jerry D via Gcc-patches wrote:
> The attached patch fixes a regression and is a patch from Steve.  I have
> regression tested it and provided a test case.  It is fairly simple and I
> will commit under the "simple" rule in a little while.
> 
> Thanks Steve for Patch. Thanks Harald for helping me get back up to speed on
> the git magic.

The pr107397.f90 test FAILs for me, one problem was that the
added diagnostics has an indefinite article before BOZ, but
the test dg-error didn't.  The other problem was that on the
other dg-error there was no space between the string and closing
}, so it was completely ignored and the error was an excess
error.

2022-12-19  Jakub Jelinek  <jakub@redhat.com>

	PR fortran/107397
	* gfortran.dg/pr107397.f90: Adjust expected diagnostic wording and
	add space between dg-error string and closing }.



	Jakub
  

Comments

Jerry D Dec. 20, 2022, 2:07 a.m. UTC | #1
On 12/19/22 2:29 AM, Jakub Jelinek wrote:
> On Sat, Dec 17, 2022 at 09:12:43AM -0800, Jerry D via Gcc-patches wrote:
>> The attached patch fixes a regression and is a patch from Steve.  I have
>> regression tested it and provided a test case.  It is fairly simple and I
>> will commit under the "simple" rule in a little while.
>>
>> Thanks Steve for Patch. Thanks Harald for helping me get back up to speed on
>> the git magic.
> 
> The pr107397.f90 test FAILs for me, one problem was that the
> added diagnostics has an indefinite article before BOZ, but
> the test dg-error didn't.  The other problem was that on the
> other dg-error there was no space between the string and closing
> }, so it was completely ignored and the error was an excess
> error.
> 
> 2022-12-19  Jakub Jelinek  <jakub@redhat.com>
> 
> 	PR fortran/107397
> 	* gfortran.dg/pr107397.f90: Adjust expected diagnostic wording and
> 	add space between dg-error string and closing }.
=== snip ===

Thanks Jakub.
  

Patch

--- gcc/testsuite/gfortran.dg/pr107397.f90.jj	2022-12-19 11:09:13.793166473 +0100
+++ gcc/testsuite/gfortran.dg/pr107397.f90	2022-12-19 11:23:02.981322107 +0100
@@ -4,6 +4,6 @@  program p
   type t
     real :: a = 1.0
   end type
-  type(t), parameter :: x = z'1' ! { dg-error "incompatible with BOZ" }
-  x%a = x%a + 2 ! { dg-error "has no IMPLICIT type"}
+  type(t), parameter :: x = z'1' ! { dg-error "incompatible with a BOZ" }
+  x%a = x%a + 2 ! { dg-error "has no IMPLICIT type" }
 end