99aa87a5b5
There were several different ways of handling the option to f18 to find predefined modules: - test_errors.sh was created by cmake substituting FLANG_INTRINSIC_MODULES_DIR into test_errors.sh.in - some tests used the flang script which has the option built it - some tests used %f18_with_includes which was replaced by the path to f18 plus the -I option - some included -I../../include/flang in their run command To make this more consistent, change %f18 to include the -intrinsic-module-directory option and use it everywhere, including to replace %flang and %f18_with_includes. This requires changing all of the invocations of the test scripts to put %f18 at the end so that it can expand to more than one argument. This eliminates the need to generate test_errors.sh which means we don't need flang/test/Semantics/CMakeLists.txt or the %B substitution. That makes the test_errors.sh command like the others, replacing %B/test/Semantics/test_errors.sh with %S/test_errors.sh. Also remove the OPTIONS: functionality as custom options can be included in the RUN: command. And remove -I/../../include/flang as that is now always included. Differential Revision: https://reviews.llvm.org/D79634
34 lines
660 B
Fortran
34 lines
660 B
Fortran
! RUN: %S/test_modfile.sh %s %t %f18
|
|
module m
|
|
character(2) :: z
|
|
character(len=3) :: y
|
|
character*4 :: x
|
|
character :: w
|
|
character(len=:), allocatable :: v
|
|
contains
|
|
subroutine s(n, a, b, c, d)
|
|
integer :: n
|
|
character(len=n+1,kind=1) :: a
|
|
character(n+2,2) :: b
|
|
character*(n+3) :: c
|
|
character(*) :: d
|
|
end
|
|
end
|
|
|
|
!Expect: m.mod
|
|
!module m
|
|
! character(2_4,1)::z
|
|
! character(3_4,1)::y
|
|
! character(4_8,1)::x
|
|
! character(1_8,1)::w
|
|
! character(:,1),allocatable::v
|
|
!contains
|
|
! subroutine s(n,a,b,c,d)
|
|
! integer(4)::n
|
|
! character(n+1_4,1)::a
|
|
! character(n+2_4,2)::b
|
|
! character(n+3_4,1)::c
|
|
! character(*,1)::d
|
|
! end
|
|
!end
|