This is an archive of the discontinued LLVM Phabricator instance.

Differential D82165

[flang] Port test_any.sh tests to FileCheck: Hand port getdefinition* tests
ClosedPublic

Authored by richard.barton.arm on Jun 19 2020, 2:35 AM.

Details

Reviewers
tskeith
DavidTruby
jdoerfert
schweitz
Commits
rG66c26d93b7be: [flang] Port test_any.sh tests to FileCheck: Hand port getdefinition* tests
Summary

These tests are sensitive to line numbers in the input and check output.
They also successively write to a temporary file then check that.

Fix the line number issues and replace the temporary file use with successive
calls to FileCheck with different check-prefixes.

Diff Detail

Event Timeline

richard.barton.arm created this revision.Jun 19 2020, 2:35 AM
Herald added a reviewer: DavidTruby. · View Herald TranscriptJun 19 2020, 2:35 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B60972: Diff 271965.Jun 19 2020, 3:12 AM
richard.barton.arm added a project: Restricted Project.Jun 22 2020, 8:51 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJun 22 2020, 8:51 AM
richard.barton.arm mentioned this in D82164: [flang] Port test_any.sh tests to FileCheck: Hand port tests which use regexes.Jun 26 2020, 8:01 AM
schweitz accepted this revision.Jun 26 2020, 8:53 AM
This revision is now accepted and ready to land.Jun 26 2020, 8:53 AM
Closed by commit rG66c26d93b7be: [flang] Port test_any.sh tests to FileCheck: Hand port getdefinition* tests (authored by richard.barton.arm). · Explain WhyJun 26 2020, 10:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
flang/
test/
Semantics/
21 lines
15 lines
10 lines
5 lines
10 lines

Diff 273785

flang/test/Semantics/getdefinition01.f90

!RUN: %S/test_any.sh %s %t %f18
! Tests -fget-definition returning source position of symbol definition. ! Tests -fget-definition returning source position of symbol definition.
module m1 module m1
private :: f private :: f
contains contains
pure subroutine s (x, yyy) bind(c) pure subroutine s (x, yyy) bind(c)
intent(in) :: x intent(in) :: x
intent(inout) :: yyy intent(inout) :: yyy
contains contains
pure subroutine ss pure subroutine ss
end subroutine end subroutine
end subroutine end subroutine
recursive pure function f() result(x) recursive pure function f() result(x)
real, allocatable :: x real, allocatable :: x
x = 1.0 x = 1.0
end function end function
end module end module
! EXEC: echo %t 1>&2; ! RUN and CHECK lines at the bottom as this test is sensitive to line numbers
! EXEC: ${F18} -fget-definition 7 17 18 -fparse-only %s > %t; ! RUN: %f18 -fget-definition 6 17 18 -fparse-only %s | FileCheck --check-prefix=CHECK1 %s
! EXEC: ${F18} -fget-definition 8 20 23 -fparse-only %s >> %t; ! RUN: %f18 -fget-definition 7 20 23 -fparse-only %s | FileCheck --check-prefix=CHECK2 %s
! EXEC: ${F18} -fget-definition 15 3 4 -fparse-only %s >> %t; ! RUN: %f18 -fget-definition 14 3 4 -fparse-only %s | FileCheck --check-prefix=CHECK3 %s
! EXEC: ${F18} -fget-definition -fparse-only %s >> %t 2>&1; ! CHECK1: x:{{.*}}getdefinition01.f90, 5, 21-22
! EXEC: cat %t | ${FileCheck} %s ! CHECK2: yyy:{{.*}}getdefinition01.f90, 5, 24-27
! CHECK:x:.*getdefinition01.f90, 6, 21-22 ! CHECK3: x:{{.*}}getdefinition01.f90, 13, 24-25
! CHECK:yyy:.*getdefinition01.f90, 6, 24-27
! CHECK:x:.*getdefinition01.f90, 14, 24-25 ! RUN: not %f18 -fget-definition -fparse-only %s 2>&1 | FileCheck --check-prefix=CHECK-ERROR %s
! CHECK:Invalid argument to -fget-definitions ! CHECK-ERROR: Invalid argument to -fget-definitions

flang/test/Semantics/getdefinition02.f

!RUN: %S/test_any.sh %s %t %f18
! Tests -fget-definition with fixed form. ! Tests -fget-definition with fixed form.
module m2 module m2
private :: f private :: f
contains contains
pure subroutine s (x, yyy) bind(c) pure subroutine s (x, yyy) bind(c)
intent(in) :: intent(in) ::
* x * x
intent(inout) :: yyy intent(inout) :: yyy
contains contains
pure subroutine ss pure subroutine ss
end subroutine end subroutine
end subroutine end subroutine
recursive pure function f() result(x) recursive pure function f() result(x)
real, allocatable :: x real, allocatable :: x
x = 1.0 x = 1.0
end function end function
end module end module
! EXEC: ${F18} -fget-definition 8 9 10 -fparse-only %s > %t; ! RUN and CHECK lines here as test is sensitive to line numbers
! EXEC: ${F18} -fget-definition 9 26 29 -fparse-only %s >> %t; ! RUN: %f18 -fget-definition 7 9 10 -fparse-only %s 2>&1 | FileCheck --check-prefix=CHECK1 %s
! EXEC: ${F18} -fget-definition 16 9 10 -fparse-only %s >> %t; ! RUN: %f18 -fget-definition 8 26 29 -fparse-only %s 2>&1 | FileCheck --check-prefix=CHECK2 %s
! EXEC: cat %t | ${FileCheck} %s ! RUN: %f18 -fget-definition 15 9 10 -fparse-only %s 2>&1 | FileCheck --check-prefix=CHECK3 %s
! CHECK:x:.*getdefinition02.f, 6, 27-28 ! CHECK1: x:{{.*}}getdefinition02.f, 5, 27-28
! CHECK:yyy:.*getdefinition02.f, 6, 30-33 ! CHECK2: yyy:{{.*}}getdefinition02.f, 5, 30-33
! CHECK:x:.*getdefinition02.f, 15, 30-31 ! CHECK3: x:{{.*}}getdefinition02.f, 14, 30-31

flang/test/Semantics/getdefinition03-a.f90

! Tests -fget-definition with INCLUDE ! Tests -fget-definition with INCLUDE
!RUN: %S/test_any.sh %s %t %f18
INCLUDE "Inputs/getdefinition03-b.f90" INCLUDE "Inputs/getdefinition03-b.f90"
program main program main
use m3 use m3
integer :: x integer :: x
x = f x = f
end program end program
! EXEC: ${F18} -fget-definition 8 6 7 -fparse-only %s > %t; ! RUN: %f18 -fget-definition 7 6 7 -fparse-only %s | FileCheck --check-prefix=CHECK1 %s
! EXEC: ${F18} -fget-definition 8 2 3 -fparse-only %s >> %t; ! RUN: %f18 -fget-definition 7 2 3 -fparse-only %s | FileCheck --check-prefix=CHECK2 %s
! EXEC: cat %t | ${FileCheck} %s; ! CHECK1: f:{{.*}}getdefinition03-b.f90, 2, 12-13
! CHECK:f:.*getdefinition03-b.f90, 2, 12-13 ! CHECK2: x:{{.*}}getdefinition03-a.f90, 6, 13-14
! CHECK:x:.*getdefinition03-a.f90, 7, 13-14

flang/test/Semantics/getdefinition04.f90

!RUN: %S/test_any.sh %s %t %f18
! Tests -fget-definition with COMMON block with same name as variable. ! Tests -fget-definition with COMMON block with same name as variable.
program main program main
integer :: x integer :: x
integer :: y integer :: y
common /x/ y common /x/ y
x = y x = y
end program end program
! EXEC: ${F18} -fget-definition 7 3 4 -fparse-only %s | ${FileCheck} %s ! RUN: %f18 -fget-definition 6 3 4 -fparse-only %s | FileCheck %s
! CHECK:x:.*getdefinition04.f90, 4, 14-15 ! CHECK: x:{{.*}}getdefinition04.f90, 3, 14-15

flang/test/Semantics/getdefinition05.f90

!RUN: %S/test_any.sh %s %t %f18
! Tests -fget-symbols-sources with BLOCK that contains same variable name as ! Tests -fget-symbols-sources with BLOCK that contains same variable name as
! another in an outer scope. ! another in an outer scope.
program main program main
integer :: x integer :: x
integer :: y integer :: y
block block
integer :: x integer :: x
integer :: y integer :: y
x = y x = y
end block end block
x = y x = y
end program end program
!! Inner x !! Inner x
! EXEC: ${F18} -fget-definition 10 5 6 -fparse-only %s > %t; ! RUN: %f18 -fget-definition 9 5 6 -fparse-only %s | FileCheck --check-prefix=CHECK1 %s
! CHECK:x:.*getdefinition05.f90, 8, 16-17 ! CHECK1: x:{{.*}}getdefinition05.f90, 7, 16-17
!! Outer y !! Outer y
! EXEC: ${F18} -fget-definition 12 7 8 -fparse-only %s >> %t; ! RUN: %f18 -fget-definition 11 7 8 -fparse-only %s | FileCheck --check-prefix=CHECK2 %s
! CHECK:y:.*getdefinition05.f90, 6, 14-15 ! CHECK2: y:{{.*}}getdefinition05.f90, 5, 14-15
! EXEC: cat %t | ${FileCheck} %s;