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
36 lines
789 B
Fortran
36 lines
789 B
Fortran
! RUN: %S/test_modfile.sh %s %t %f18
|
|
! Test 7.6 enum values
|
|
|
|
module m1
|
|
integer, parameter :: x(1) = [4]
|
|
enum, bind(C)
|
|
enumerator :: red, green
|
|
enumerator blue
|
|
enumerator yellow
|
|
enumerator :: purple = 2
|
|
enumerator :: brown
|
|
end enum
|
|
|
|
enum, bind(C)
|
|
enumerator :: oak, beech = -rank(x)*x(1), pine, poplar = brown
|
|
end enum
|
|
|
|
end
|
|
|
|
!Expect: m1.mod
|
|
!module m1
|
|
!integer(4),parameter::x(1_8:1_8)=[INTEGER(4)::4_4]
|
|
!integer(4),parameter::red=0_4
|
|
!integer(4),parameter::green=1_4
|
|
!integer(4),parameter::blue=2_4
|
|
!integer(4),parameter::yellow=3_4
|
|
!integer(4),parameter::purple=2_4
|
|
!integer(4),parameter::brown=3_4
|
|
!integer(4),parameter::oak=0_4
|
|
!integer(4),parameter::beech=-4_4
|
|
!intrinsic::rank
|
|
!integer(4),parameter::pine=-3_4
|
|
!integer(4),parameter::poplar=3_4
|
|
!end
|
|
|