Patchwork [testsuite] : Fix scan string of gfortran.dg/intrinsic_size_3.f90

login
register
mail settings
Submitter Uros Bizjak
Date Jan. 9, 2013, 7:15 p.m.
Message ID <CAFULd4bxyQig00bBS7Z+ef4hP1O3k0jLUxTvsv9063hL4Er2Jw@mail.gmail.com>
Download mbox | patch
Permalink /patch/210824/
State New
Headers show

Comments

Uros Bizjak - Jan. 9, 2013, 7:15 p.m.
Hello!

The regexp in the scan string assumes that dumped temporaries have
exactly 4 numbers. Sometimes, this is not the case.

Attached patch fixes scan string to match a number with arbitrary
number of places instead.

2012-01-09  Uros Bizjak  <ubizjak@gmail.com>

	* gfortran.dg/intrinsic_size_3.f90: Make scan-tree-dump-times
	number matching more robust.

Tested on x86_64-pc-linux-gnu and alphaev68-linux-gnu, where it fixes
spurious test failure.

OK for mainline?

Uros.
Tobias Burnus - Jan. 9, 2013, 7:29 p.m.
The patch is OK. Thanks!

Tobias

Uros Bizjak wrote:
> The regexp in the scan string assumes that dumped temporaries have
> exactly 4 numbers. Sometimes, this is not the case.
>
> Attached patch fixes scan string to match a number with arbitrary
> number of places instead.
>
> 2012-01-09  Uros Bizjak  <ubizjak@gmail.com>
>
> 	* gfortran.dg/intrinsic_size_3.f90: Make scan-tree-dump-times
> 	number matching more robust.
>
> Tested on x86_64-pc-linux-gnu and alphaev68-linux-gnu, where it fixes
> spurious test failure.
>
> OK for mainline?

Patch

Index: gfortran.dg/intrinsic_size_3.f90
===================================================================
--- gfortran.dg/intrinsic_size_3.f90	(revision 195057)
+++ gfortran.dg/intrinsic_size_3.f90	(working copy)
@@ -22,5 +22,5 @@ 
   stop
 end program bug
 
-! { dg-final { scan-tree-dump-times "iszs = \\(integer\\(kind=2\\)\\) MAX_EXPR <\\(D.....->dim.0..ubound - D.....->dim.0..lbound\\) \\+ 1, 0>;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "iszs = \\(integer\\(kind=2\\)\\) MAX_EXPR <\\(D.\[0-9\]+->dim.0..ubound - D.\[0-9\]+->dim.0..lbound\\) \\+ 1, 0>;" 1 "original" } }
 ! { dg-final { cleanup-tree-dump "original" } }