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
42 lines
813 B
Fortran
42 lines
813 B
Fortran
! RUN: %S/test_modfile.sh %s %t %f18
|
|
! Check modfile generation for external declarations
|
|
module m
|
|
real, external :: a
|
|
logical b
|
|
external c
|
|
complex c
|
|
external b, d
|
|
procedure() :: e
|
|
procedure(real) :: f
|
|
procedure(s) :: g
|
|
type t
|
|
procedure(), pointer, nopass :: e
|
|
procedure(real), nopass, pointer :: f
|
|
procedure(s), private, pointer :: g
|
|
end type
|
|
contains
|
|
subroutine s(x)
|
|
class(t) :: x
|
|
end
|
|
end
|
|
|
|
!Expect: m.mod
|
|
!module m
|
|
! procedure(real(4))::a
|
|
! procedure(logical(4))::b
|
|
! procedure(complex(4))::c
|
|
! procedure()::d
|
|
! procedure()::e
|
|
! procedure(real(4))::f
|
|
! procedure(s)::g
|
|
! type::t
|
|
! procedure(),nopass,pointer::e
|
|
! procedure(real(4)),nopass,pointer::f
|
|
! procedure(s),pointer,private::g
|
|
! end type
|
|
!contains
|
|
! subroutine s(x)
|
|
! class(t)::x
|
|
! end
|
|
!end
|