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
96 lines
1.3 KiB
Fortran
96 lines
1.3 KiB
Fortran
! RUN: %S/test_modfile.sh %s %t %f18
|
|
! Check correct modfile generation for type with private component.
|
|
module m
|
|
integer :: i
|
|
integer, private :: j
|
|
type :: t
|
|
integer :: i
|
|
integer, private :: j
|
|
end type
|
|
type, private :: u
|
|
end type
|
|
type(t) :: x
|
|
end
|
|
|
|
!Expect: m.mod
|
|
!module m
|
|
!integer(4)::i
|
|
!integer(4),private::j
|
|
!type::t
|
|
!integer(4)::i
|
|
!integer(4),private::j
|
|
!end type
|
|
!type,private::u
|
|
!end type
|
|
!type(t)::x
|
|
!end
|
|
|
|
! Check correct modfile generation for type with private module procedure.
|
|
|
|
module m2
|
|
private :: s1
|
|
contains
|
|
subroutine s1()
|
|
end
|
|
subroutine s2()
|
|
end
|
|
end
|
|
|
|
!Expect: m2.mod
|
|
!module m2
|
|
! private::s1
|
|
!contains
|
|
! subroutine s1()
|
|
! end
|
|
! subroutine s2()
|
|
! end
|
|
!end
|
|
|
|
module m3
|
|
private
|
|
public :: f1
|
|
contains
|
|
real function f1()
|
|
end
|
|
real function f2()
|
|
end
|
|
end
|
|
|
|
!Expect: m3.mod
|
|
!module m3
|
|
! private::f2
|
|
!contains
|
|
! function f1()
|
|
! real(4)::f1
|
|
! end
|
|
! function f2()
|
|
! real(4)::f2
|
|
! end
|
|
!end
|
|
|
|
! Test optional dummy procedure
|
|
module m4
|
|
contains
|
|
subroutine s(f)
|
|
interface
|
|
logical recursive function f()
|
|
implicit none
|
|
end function
|
|
end interface
|
|
optional f
|
|
end
|
|
end
|
|
|
|
!Expect: m4.mod
|
|
!module m4
|
|
!contains
|
|
! subroutine s(f)
|
|
! optional::f
|
|
! interface
|
|
! recursive function f()
|
|
! logical(4)::f
|
|
! end
|
|
! end interface
|
|
! end
|
|
!end
|