[PATCH] D79634: [flang][NFC] Simplify semantics test scripts

Tim Keith via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Fri May 8 09:37:55 PDT 2020


tskeith created this revision.
tskeith added reviewers: sscalpone, klausler, PeteSteinfeld.
tskeith added a project: Flang.
Herald added subscribers: llvm-commits, mgorny.
Herald added a reviewer: jdoerfert.
Herald added a reviewer: jdoerfert.
Herald added a reviewer: DavidTruby.
Herald added a project: LLVM.

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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D79634

Files:
  flang/test/CMakeLists.txt
  flang/test/Evaluate/folding01.f90
  flang/test/Evaluate/folding02.f90
  flang/test/Evaluate/folding03.f90
  flang/test/Evaluate/folding04.f90
  flang/test/Evaluate/folding05.f90
  flang/test/Evaluate/folding06.f90
  flang/test/Evaluate/folding07.f90
  flang/test/Evaluate/folding08.f90
  flang/test/Evaluate/folding09.f90
  flang/test/Evaluate/test_folding.sh
  flang/test/Lower/pre-fir-tree04.f90
  flang/test/Semantics/CMakeLists.txt
  flang/test/Semantics/allocate01.f90
  flang/test/Semantics/allocate02.f90
  flang/test/Semantics/allocate03.f90
  flang/test/Semantics/allocate04.f90
  flang/test/Semantics/allocate05.f90
  flang/test/Semantics/allocate06.f90
  flang/test/Semantics/allocate07.f90
  flang/test/Semantics/allocate08.f90
  flang/test/Semantics/allocate09.f90
  flang/test/Semantics/allocate10.f90
  flang/test/Semantics/allocate11.f90
  flang/test/Semantics/allocate12.f90
  flang/test/Semantics/allocate13.f90
  flang/test/Semantics/altreturn01.f90
  flang/test/Semantics/altreturn02.f90
  flang/test/Semantics/altreturn03.f90
  flang/test/Semantics/altreturn04.f90
  flang/test/Semantics/altreturn05.f90
  flang/test/Semantics/assign01.f90
  flang/test/Semantics/assign02.f90
  flang/test/Semantics/assign03.f90
  flang/test/Semantics/assign04.f90
  flang/test/Semantics/assign06.f90
  flang/test/Semantics/assign07.f90
  flang/test/Semantics/bad-forward-type.f90
  flang/test/Semantics/bindings01.f90
  flang/test/Semantics/block-data01.f90
  flang/test/Semantics/blockconstruct01.f90
  flang/test/Semantics/blockconstruct02.f90
  flang/test/Semantics/blockconstruct03.f90
  flang/test/Semantics/c_f_pointer.f90
  flang/test/Semantics/call01.f90
  flang/test/Semantics/call02.f90
  flang/test/Semantics/call03.f90
  flang/test/Semantics/call04.f90
  flang/test/Semantics/call05.f90
  flang/test/Semantics/call06.f90
  flang/test/Semantics/call07.f90
  flang/test/Semantics/call08.f90
  flang/test/Semantics/call09.f90
  flang/test/Semantics/call10.f90
  flang/test/Semantics/call11.f90
  flang/test/Semantics/call12.f90
  flang/test/Semantics/call13.f90
  flang/test/Semantics/call14.f90
  flang/test/Semantics/call15.f90
  flang/test/Semantics/canondo01.f90
  flang/test/Semantics/canondo02.f90
  flang/test/Semantics/canondo03.f90
  flang/test/Semantics/canondo04.f90
  flang/test/Semantics/canondo05.f90
  flang/test/Semantics/canondo06.f90
  flang/test/Semantics/canondo07.f90
  flang/test/Semantics/canondo08.f90
  flang/test/Semantics/canondo09.f90
  flang/test/Semantics/canondo10.f90
  flang/test/Semantics/canondo11.f90
  flang/test/Semantics/canondo12.f90
  flang/test/Semantics/canondo13.f90
  flang/test/Semantics/canondo14.f90
  flang/test/Semantics/canondo15.f90
  flang/test/Semantics/canondo16.f90
  flang/test/Semantics/canondo17.f90
  flang/test/Semantics/canondo18.f90
  flang/test/Semantics/canondo19.f90
  flang/test/Semantics/case01.f90
  flang/test/Semantics/coarrays01.f90
  flang/test/Semantics/common.sh
  flang/test/Semantics/complex01.f90
  flang/test/Semantics/computed-goto01.f90
  flang/test/Semantics/computed-goto02.f90
  flang/test/Semantics/critical01.f90
  flang/test/Semantics/critical02.f90
  flang/test/Semantics/critical03.f90
  flang/test/Semantics/critical04.f90
  flang/test/Semantics/data01.f90
  flang/test/Semantics/data02.f90
  flang/test/Semantics/data03.f90
  flang/test/Semantics/deallocate01.f90
  flang/test/Semantics/deallocate04.f90
  flang/test/Semantics/deallocate05.f90
  flang/test/Semantics/doconcurrent01.f90
  flang/test/Semantics/doconcurrent02.f90
  flang/test/Semantics/doconcurrent03.f90
  flang/test/Semantics/doconcurrent04.f90
  flang/test/Semantics/doconcurrent05.f90
  flang/test/Semantics/doconcurrent06.f90
  flang/test/Semantics/doconcurrent07.f90
  flang/test/Semantics/doconcurrent08.f90
  flang/test/Semantics/dosemantics01.f90
  flang/test/Semantics/dosemantics02.f90
  flang/test/Semantics/dosemantics03.f90
  flang/test/Semantics/dosemantics04.f90
  flang/test/Semantics/dosemantics05.f90
  flang/test/Semantics/dosemantics06.f90
  flang/test/Semantics/dosemantics07.f90
  flang/test/Semantics/dosemantics08.f90
  flang/test/Semantics/dosemantics09.f90
  flang/test/Semantics/dosemantics10.f90
  flang/test/Semantics/dosemantics11.f90
  flang/test/Semantics/dosemantics12.f90
  flang/test/Semantics/entry01.f90
  flang/test/Semantics/equivalence01.f90
  flang/test/Semantics/expr-errors01.f90
  flang/test/Semantics/expr-errors02.f90
  flang/test/Semantics/forall01.f90
  flang/test/Semantics/getdefinition01.f90
  flang/test/Semantics/getdefinition02.f
  flang/test/Semantics/getdefinition03-a.f90
  flang/test/Semantics/getdefinition04.f90
  flang/test/Semantics/getdefinition05.f90
  flang/test/Semantics/getsymbols01.f90
  flang/test/Semantics/getsymbols02.f90
  flang/test/Semantics/getsymbols03-a.f90
  flang/test/Semantics/getsymbols04.f90
  flang/test/Semantics/getsymbols05.f90
  flang/test/Semantics/if_arith01.f90
  flang/test/Semantics/if_arith02.f90
  flang/test/Semantics/if_arith03.f90
  flang/test/Semantics/if_arith04.f90
  flang/test/Semantics/if_construct01.f90
  flang/test/Semantics/if_construct02.f90
  flang/test/Semantics/if_stmt01.f90
  flang/test/Semantics/if_stmt02.f90
  flang/test/Semantics/if_stmt03.f90
  flang/test/Semantics/implicit01.f90
  flang/test/Semantics/implicit02.f90
  flang/test/Semantics/implicit03.f90
  flang/test/Semantics/implicit04.f90
  flang/test/Semantics/implicit05.f90
  flang/test/Semantics/implicit06.f90
  flang/test/Semantics/implicit07.f90
  flang/test/Semantics/implicit08.f90
  flang/test/Semantics/init01.f90
  flang/test/Semantics/int-literals.f90
  flang/test/Semantics/io01.f90
  flang/test/Semantics/io02.f90
  flang/test/Semantics/io03.f90
  flang/test/Semantics/io04.f90
  flang/test/Semantics/io05.f90
  flang/test/Semantics/io06.f90
  flang/test/Semantics/io07.f90
  flang/test/Semantics/io08.f90
  flang/test/Semantics/io09.f90
  flang/test/Semantics/io10.f90
  flang/test/Semantics/kinds01.f90
  flang/test/Semantics/kinds02.f90
  flang/test/Semantics/kinds03.f90
  flang/test/Semantics/kinds04.f90
  flang/test/Semantics/label01.F90
  flang/test/Semantics/label02.f90
  flang/test/Semantics/label03.f90
  flang/test/Semantics/label04.f90
  flang/test/Semantics/label05.f90
  flang/test/Semantics/label06.f90
  flang/test/Semantics/label07.f90
  flang/test/Semantics/label08.f90
  flang/test/Semantics/label09.f90
  flang/test/Semantics/label10.f90
  flang/test/Semantics/label11.f90
  flang/test/Semantics/label12.f90
  flang/test/Semantics/label13.f90
  flang/test/Semantics/label14.f90
  flang/test/Semantics/misc-declarations.f90
  flang/test/Semantics/modfile01.f90
  flang/test/Semantics/modfile02.f90
  flang/test/Semantics/modfile03.f90
  flang/test/Semantics/modfile04.f90
  flang/test/Semantics/modfile05.f90
  flang/test/Semantics/modfile06.f90
  flang/test/Semantics/modfile07.f90
  flang/test/Semantics/modfile08.f90
  flang/test/Semantics/modfile09.f90
  flang/test/Semantics/modfile10.f90
  flang/test/Semantics/modfile11.f90
  flang/test/Semantics/modfile12.f90
  flang/test/Semantics/modfile13.f90
  flang/test/Semantics/modfile14.f90
  flang/test/Semantics/modfile15.f90
  flang/test/Semantics/modfile16.f90
  flang/test/Semantics/modfile17.f90
  flang/test/Semantics/modfile18.f90
  flang/test/Semantics/modfile19.f90
  flang/test/Semantics/modfile20.f90
  flang/test/Semantics/modfile21.f90
  flang/test/Semantics/modfile22.f90
  flang/test/Semantics/modfile23.f90
  flang/test/Semantics/modfile24.f90
  flang/test/Semantics/modfile25.f90
  flang/test/Semantics/modfile26.f90
  flang/test/Semantics/modfile27.f90
  flang/test/Semantics/modfile28.f90
  flang/test/Semantics/modfile29.f90
  flang/test/Semantics/modfile30.f90
  flang/test/Semantics/modfile31.f90
  flang/test/Semantics/modfile32.f90
  flang/test/Semantics/modfile33.f90
  flang/test/Semantics/modfile34.f90
  flang/test/Semantics/modfile35.f90
  flang/test/Semantics/namelist01.f90
  flang/test/Semantics/null01.f90
  flang/test/Semantics/nullify01.f90
  flang/test/Semantics/nullify02.f90
  flang/test/Semantics/omp-atomic.f90
  flang/test/Semantics/omp-clause-validity01.f90
  flang/test/Semantics/omp-combined-constructs.f90
  flang/test/Semantics/omp-declarative-directive.f90
  flang/test/Semantics/omp-device-constructs.f90
  flang/test/Semantics/omp-loop-association.f90
  flang/test/Semantics/omp-nested01.f90
  flang/test/Semantics/omp-resolve01.f90
  flang/test/Semantics/omp-resolve02.f90
  flang/test/Semantics/omp-resolve03.f90
  flang/test/Semantics/omp-resolve04.f90
  flang/test/Semantics/omp-resolve05.f90
  flang/test/Semantics/omp-symbol01.f90
  flang/test/Semantics/omp-symbol02.f90
  flang/test/Semantics/omp-symbol03.f90
  flang/test/Semantics/omp-symbol04.f90
  flang/test/Semantics/omp-symbol05.f90
  flang/test/Semantics/omp-symbol06.f90
  flang/test/Semantics/omp-symbol07.f90
  flang/test/Semantics/omp-symbol08.f90
  flang/test/Semantics/procinterface01.f90
  flang/test/Semantics/resolve01.f90
  flang/test/Semantics/resolve02.f90
  flang/test/Semantics/resolve03.f90
  flang/test/Semantics/resolve04.f90
  flang/test/Semantics/resolve05.f90
  flang/test/Semantics/resolve06.f90
  flang/test/Semantics/resolve07.f90
  flang/test/Semantics/resolve08.f90
  flang/test/Semantics/resolve09.f90
  flang/test/Semantics/resolve10.f90
  flang/test/Semantics/resolve11.f90
  flang/test/Semantics/resolve12.f90
  flang/test/Semantics/resolve13.f90
  (105 more files...)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79634.262888.patch
Type: text/x-patch
Size: 140712 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200508/8c786776/attachment-0001.bin>


More information about the llvm-commits mailing list