[all-commits] [llvm/llvm-project] 99aa87: [flang][NFC] Simplify semantics test scripts

Tim Keith via All-commits all-commits at lists.llvm.org
Mon May 11 11:50:25 PDT 2020 

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: 99aa87a5b5371b3c06480e3ff99dcc4f2adf2c2a
      https://github.com/llvm/llvm-project/commit/99aa87a5b5371b3c06480e3ff99dcc4f2adf2c2a
  Author: Tim Keith <tkeith at nvidia.com>
  Date:   2020-05-11 (Mon, 11 May 2020)

  Changed paths:
    M flang/test/CMakeLists.txt
    M flang/test/Evaluate/folding01.f90
    M flang/test/Evaluate/folding02.f90
    M flang/test/Evaluate/folding03.f90
    M flang/test/Evaluate/folding04.f90
    M flang/test/Evaluate/folding05.f90
    M flang/test/Evaluate/folding06.f90
    M flang/test/Evaluate/folding07.f90
    M flang/test/Evaluate/folding08.f90
    M flang/test/Evaluate/folding09.f90
    M flang/test/Evaluate/test_folding.sh
    M flang/test/Lower/pre-fir-tree04.f90
    R flang/test/Semantics/CMakeLists.txt
    M flang/test/Semantics/allocate01.f90
    M flang/test/Semantics/allocate02.f90
    M flang/test/Semantics/allocate03.f90
    M flang/test/Semantics/allocate04.f90
    M flang/test/Semantics/allocate05.f90
    M flang/test/Semantics/allocate06.f90
    M flang/test/Semantics/allocate07.f90
    M flang/test/Semantics/allocate08.f90
    M flang/test/Semantics/allocate09.f90
    M flang/test/Semantics/allocate10.f90
    M flang/test/Semantics/allocate11.f90
    M flang/test/Semantics/allocate12.f90
    M flang/test/Semantics/allocate13.f90
    M flang/test/Semantics/altreturn01.f90
    M flang/test/Semantics/altreturn02.f90
    M flang/test/Semantics/altreturn03.f90
    M flang/test/Semantics/altreturn04.f90
    M flang/test/Semantics/altreturn05.f90
    M flang/test/Semantics/assign01.f90
    M flang/test/Semantics/assign02.f90
    M flang/test/Semantics/assign03.f90
    M flang/test/Semantics/assign04.f90
    M flang/test/Semantics/assign06.f90
    M flang/test/Semantics/assign07.f90
    M flang/test/Semantics/bad-forward-type.f90
    M flang/test/Semantics/bindings01.f90
    M flang/test/Semantics/block-data01.f90
    M flang/test/Semantics/blockconstruct01.f90
    M flang/test/Semantics/blockconstruct02.f90
    M flang/test/Semantics/blockconstruct03.f90
    M flang/test/Semantics/c_f_pointer.f90
    M flang/test/Semantics/call01.f90
    M flang/test/Semantics/call02.f90
    M flang/test/Semantics/call03.f90
    M flang/test/Semantics/call04.f90
    M flang/test/Semantics/call05.f90
    M flang/test/Semantics/call06.f90
    M flang/test/Semantics/call07.f90
    M flang/test/Semantics/call08.f90
    M flang/test/Semantics/call09.f90
    M flang/test/Semantics/call10.f90
    M flang/test/Semantics/call11.f90
    M flang/test/Semantics/call12.f90
    M flang/test/Semantics/call13.f90
    M flang/test/Semantics/call14.f90
    M flang/test/Semantics/call15.f90
    M flang/test/Semantics/canondo01.f90
    M flang/test/Semantics/canondo02.f90
    M flang/test/Semantics/canondo03.f90
    M flang/test/Semantics/canondo04.f90
    M flang/test/Semantics/canondo05.f90
    M flang/test/Semantics/canondo06.f90
    M flang/test/Semantics/canondo07.f90
    M flang/test/Semantics/canondo08.f90
    M flang/test/Semantics/canondo09.f90
    M flang/test/Semantics/canondo10.f90
    M flang/test/Semantics/canondo11.f90
    M flang/test/Semantics/canondo12.f90
    M flang/test/Semantics/canondo13.f90
    M flang/test/Semantics/canondo14.f90
    M flang/test/Semantics/canondo15.f90
    M flang/test/Semantics/canondo16.f90
    M flang/test/Semantics/canondo17.f90
    M flang/test/Semantics/canondo18.f90
    M flang/test/Semantics/canondo19.f90
    M flang/test/Semantics/case01.f90
    M flang/test/Semantics/coarrays01.f90
    M flang/test/Semantics/common.sh
    M flang/test/Semantics/complex01.f90
    M flang/test/Semantics/computed-goto01.f90
    M flang/test/Semantics/computed-goto02.f90
    M flang/test/Semantics/critical01.f90
    M flang/test/Semantics/critical02.f90
    M flang/test/Semantics/critical03.f90
    M flang/test/Semantics/critical04.f90
    M flang/test/Semantics/data01.f90
    M flang/test/Semantics/data02.f90
    M flang/test/Semantics/data03.f90
    M flang/test/Semantics/deallocate01.f90
    M flang/test/Semantics/deallocate04.f90
    M flang/test/Semantics/deallocate05.f90
    M flang/test/Semantics/doconcurrent01.f90
    M flang/test/Semantics/doconcurrent02.f90
    M flang/test/Semantics/doconcurrent03.f90
    M flang/test/Semantics/doconcurrent04.f90
    M flang/test/Semantics/doconcurrent05.f90
    M flang/test/Semantics/doconcurrent06.f90
    M flang/test/Semantics/doconcurrent07.f90
    M flang/test/Semantics/doconcurrent08.f90
    M flang/test/Semantics/dosemantics01.f90
    M flang/test/Semantics/dosemantics02.f90
    M flang/test/Semantics/dosemantics03.f90
    M flang/test/Semantics/dosemantics04.f90
    M flang/test/Semantics/dosemantics05.f90
    M flang/test/Semantics/dosemantics06.f90
    M flang/test/Semantics/dosemantics07.f90
    M flang/test/Semantics/dosemantics08.f90
    M flang/test/Semantics/dosemantics09.f90
    M flang/test/Semantics/dosemantics10.f90
    M flang/test/Semantics/dosemantics11.f90
    M flang/test/Semantics/dosemantics12.f90
    M flang/test/Semantics/entry01.f90
    M flang/test/Semantics/equivalence01.f90
    M flang/test/Semantics/expr-errors01.f90
    M flang/test/Semantics/expr-errors02.f90
    M flang/test/Semantics/forall01.f90
    M flang/test/Semantics/getdefinition01.f90
    M flang/test/Semantics/getdefinition02.f
    M flang/test/Semantics/getdefinition03-a.f90
    M flang/test/Semantics/getdefinition04.f90
    M flang/test/Semantics/getdefinition05.f90
    M flang/test/Semantics/getsymbols01.f90
    M flang/test/Semantics/getsymbols02.f90
    M flang/test/Semantics/getsymbols03-a.f90
    M flang/test/Semantics/getsymbols04.f90
    M flang/test/Semantics/getsymbols05.f90
    M flang/test/Semantics/if_arith01.f90
    M flang/test/Semantics/if_arith02.f90
    M flang/test/Semantics/if_arith03.f90
    M flang/test/Semantics/if_arith04.f90
    M flang/test/Semantics/if_construct01.f90
    M flang/test/Semantics/if_construct02.f90
    M flang/test/Semantics/if_stmt01.f90
    M flang/test/Semantics/if_stmt02.f90
    M flang/test/Semantics/if_stmt03.f90
    M flang/test/Semantics/implicit01.f90
    M flang/test/Semantics/implicit02.f90
    M flang/test/Semantics/implicit03.f90
    M flang/test/Semantics/implicit04.f90
    M flang/test/Semantics/implicit05.f90
    M flang/test/Semantics/implicit06.f90
    M flang/test/Semantics/implicit07.f90
    M flang/test/Semantics/implicit08.f90
    M flang/test/Semantics/init01.f90
    M flang/test/Semantics/int-literals.f90
    M flang/test/Semantics/io01.f90
    M flang/test/Semantics/io02.f90
    M flang/test/Semantics/io03.f90
    M flang/test/Semantics/io04.f90
    M flang/test/Semantics/io05.f90
    M flang/test/Semantics/io06.f90
    M flang/test/Semantics/io07.f90
    M flang/test/Semantics/io08.f90
    M flang/test/Semantics/io09.f90
    M flang/test/Semantics/io10.f90
    M flang/test/Semantics/kinds01.f90
    M flang/test/Semantics/kinds02.f90
    M flang/test/Semantics/kinds03.f90
    M flang/test/Semantics/kinds04.f90
    M flang/test/Semantics/label01.F90
    M flang/test/Semantics/label02.f90
    M flang/test/Semantics/label03.f90
    M flang/test/Semantics/label04.f90
    M flang/test/Semantics/label05.f90
    M flang/test/Semantics/label06.f90
    M flang/test/Semantics/label07.f90
    M flang/test/Semantics/label08.f90
    M flang/test/Semantics/label09.f90
    M flang/test/Semantics/label10.f90
    M flang/test/Semantics/label11.f90
    M flang/test/Semantics/label12.f90
    M flang/test/Semantics/label13.f90
    M flang/test/Semantics/label14.f90
    M flang/test/Semantics/misc-declarations.f90
    M flang/test/Semantics/modfile01.f90
    M flang/test/Semantics/modfile02.f90
    M flang/test/Semantics/modfile03.f90
    M flang/test/Semantics/modfile04.f90
    M flang/test/Semantics/modfile05.f90
    M flang/test/Semantics/modfile06.f90
    M flang/test/Semantics/modfile07.f90
    M flang/test/Semantics/modfile08.f90
    M flang/test/Semantics/modfile09.f90
    M flang/test/Semantics/modfile10.f90
    M flang/test/Semantics/modfile11.f90
    M flang/test/Semantics/modfile12.f90
    M flang/test/Semantics/modfile13.f90
    M flang/test/Semantics/modfile14.f90
    M flang/test/Semantics/modfile15.f90
    M flang/test/Semantics/modfile16.f90
    M flang/test/Semantics/modfile17.f90
    M flang/test/Semantics/modfile18.f90
    M flang/test/Semantics/modfile19.f90
    M flang/test/Semantics/modfile20.f90
    M flang/test/Semantics/modfile21.f90
    M flang/test/Semantics/modfile22.f90
    M flang/test/Semantics/modfile23.f90
    M flang/test/Semantics/modfile24.f90
    M flang/test/Semantics/modfile25.f90
    M flang/test/Semantics/modfile26.f90
    M flang/test/Semantics/modfile27.f90
    M flang/test/Semantics/modfile28.f90
    M flang/test/Semantics/modfile29.f90
    M flang/test/Semantics/modfile30.f90
    M flang/test/Semantics/modfile31.f90
    M flang/test/Semantics/modfile32.f90
    M flang/test/Semantics/modfile33.f90
    M flang/test/Semantics/modfile34.f90
    M flang/test/Semantics/modfile35.f90
    M flang/test/Semantics/namelist01.f90
    M flang/test/Semantics/null01.f90
    M flang/test/Semantics/nullify01.f90
    M flang/test/Semantics/nullify02.f90
    M flang/test/Semantics/omp-atomic.f90
    M flang/test/Semantics/omp-clause-validity01.f90
    M flang/test/Semantics/omp-combined-constructs.f90
    M flang/test/Semantics/omp-declarative-directive.f90
    M flang/test/Semantics/omp-device-constructs.f90
    M flang/test/Semantics/omp-loop-association.f90
    M flang/test/Semantics/omp-nested01.f90
    M flang/test/Semantics/omp-resolve01.f90
    M flang/test/Semantics/omp-resolve02.f90
    M flang/test/Semantics/omp-resolve03.f90
    M flang/test/Semantics/omp-resolve04.f90
    M flang/test/Semantics/omp-resolve05.f90
    M flang/test/Semantics/omp-symbol01.f90
    M flang/test/Semantics/omp-symbol02.f90
    M flang/test/Semantics/omp-symbol03.f90
    M flang/test/Semantics/omp-symbol04.f90
    M flang/test/Semantics/omp-symbol05.f90
    M flang/test/Semantics/omp-symbol06.f90
    M flang/test/Semantics/omp-symbol07.f90
    M flang/test/Semantics/omp-symbol08.f90
    M flang/test/Semantics/procinterface01.f90
    M flang/test/Semantics/resolve01.f90
    M flang/test/Semantics/resolve02.f90
    M flang/test/Semantics/resolve03.f90
    M flang/test/Semantics/resolve04.f90
    M flang/test/Semantics/resolve05.f90
    M flang/test/Semantics/resolve06.f90
    M flang/test/Semantics/resolve07.f90
    M flang/test/Semantics/resolve08.f90
    M flang/test/Semantics/resolve09.f90
    M flang/test/Semantics/resolve10.f90
    M flang/test/Semantics/resolve11.f90
    M flang/test/Semantics/resolve12.f90
    M flang/test/Semantics/resolve13.f90
    M flang/test/Semantics/resolve14.f90
    M flang/test/Semantics/resolve15.f90
    M flang/test/Semantics/resolve16.f90
    M flang/test/Semantics/resolve17.f90
    M flang/test/Semantics/resolve18.f90
    M flang/test/Semantics/resolve19.f90
    M flang/test/Semantics/resolve20.f90
    M flang/test/Semantics/resolve21.f90
    M flang/test/Semantics/resolve22.f90
    M flang/test/Semantics/resolve23.f90
    M flang/test/Semantics/resolve24.f90
    M flang/test/Semantics/resolve25.f90
    M flang/test/Semantics/resolve26.f90
    M flang/test/Semantics/resolve27.f90
    M flang/test/Semantics/resolve28.f90
    M flang/test/Semantics/resolve29.f90
    M flang/test/Semantics/resolve30.f90
    M flang/test/Semantics/resolve31.f90
    M flang/test/Semantics/resolve32.f90
    M flang/test/Semantics/resolve33.f90
    M flang/test/Semantics/resolve34.f90
    M flang/test/Semantics/resolve35.f90
    M flang/test/Semantics/resolve36.f90
    M flang/test/Semantics/resolve37.f90
    M flang/test/Semantics/resolve38.f90
    M flang/test/Semantics/resolve39.f90
    M flang/test/Semantics/resolve40.f90
    M flang/test/Semantics/resolve41.f90
    M flang/test/Semantics/resolve42.f90
    M flang/test/Semantics/resolve43.f90
    M flang/test/Semantics/resolve44.f90
    M flang/test/Semantics/resolve45.f90
    M flang/test/Semantics/resolve46.f90
    M flang/test/Semantics/resolve47.f90
    M flang/test/Semantics/resolve48.f90
    M flang/test/Semantics/resolve49.f90
    M flang/test/Semantics/resolve50.f90
    M flang/test/Semantics/resolve51.f90
    M flang/test/Semantics/resolve52.f90
    M flang/test/Semantics/resolve53.f90
    M flang/test/Semantics/resolve54.f90
    M flang/test/Semantics/resolve55.f90
    M flang/test/Semantics/resolve56.f90
    M flang/test/Semantics/resolve57.f90
    M flang/test/Semantics/resolve58.f90
    M flang/test/Semantics/resolve59.f90
    M flang/test/Semantics/resolve60.f90
    M flang/test/Semantics/resolve61.f90
    M flang/test/Semantics/resolve62.f90
    M flang/test/Semantics/resolve63.f90
    M flang/test/Semantics/resolve64.f90
    M flang/test/Semantics/resolve65.f90
    M flang/test/Semantics/resolve66.f90
    M flang/test/Semantics/resolve67.f90
    M flang/test/Semantics/resolve68.f90
    M flang/test/Semantics/resolve69.f90
    M flang/test/Semantics/resolve70.f90
    M flang/test/Semantics/resolve71.f90
    M flang/test/Semantics/resolve72.f90
    M flang/test/Semantics/resolve73.f90
    M flang/test/Semantics/resolve74.f90
    M flang/test/Semantics/resolve75.f90
    M flang/test/Semantics/resolve76.f90
    M flang/test/Semantics/resolve77.f90
    M flang/test/Semantics/resolve78.f90
    M flang/test/Semantics/resolve79.f90
    M flang/test/Semantics/resolve80.f90
    M flang/test/Semantics/resolve81.f90
    M flang/test/Semantics/resolve82.f90
    M flang/test/Semantics/resolve83.f90
    M flang/test/Semantics/resolve84.f90
    M flang/test/Semantics/resolve85.f90
    M flang/test/Semantics/resolve86.f90
    M flang/test/Semantics/resolve87.f90
    M flang/test/Semantics/resolve88.f90
    M flang/test/Semantics/resolve89.f90
    M flang/test/Semantics/select-rank.f90
    M flang/test/Semantics/select-rank02.f90
    M flang/test/Semantics/separate-mp01.f90
    M flang/test/Semantics/separate-mp02.f90
    M flang/test/Semantics/stop01.f90
    M flang/test/Semantics/structconst01.f90
    M flang/test/Semantics/structconst02.f90
    M flang/test/Semantics/structconst03.f90
    M flang/test/Semantics/structconst04.f90
    M flang/test/Semantics/symbol01.f90
    M flang/test/Semantics/symbol02.f90
    M flang/test/Semantics/symbol03.f90
    M flang/test/Semantics/symbol05.f90
    M flang/test/Semantics/symbol06.f90
    M flang/test/Semantics/symbol07.f90
    M flang/test/Semantics/symbol08.f90
    M flang/test/Semantics/symbol09.f90
    M flang/test/Semantics/symbol10.f90
    M flang/test/Semantics/symbol11.f90
    M flang/test/Semantics/symbol12.f90
    M flang/test/Semantics/symbol13.f90
    M flang/test/Semantics/symbol14.f90
    M flang/test/Semantics/symbol15.f90
    M flang/test/Semantics/symbol16.f90
    M flang/test/Semantics/symbol17.f90
    M flang/test/Semantics/test_any.sh
    A flang/test/Semantics/test_errors.sh
    R flang/test/Semantics/test_errors.sh.in
    M flang/test/Semantics/test_modfile.sh
    M flang/test/Semantics/test_symbols.sh
    M flang/test/lit.cfg.py

  Log Message:
  -----------
  [flang][NFC] Simplify semantics test scripts

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

More information about the All-commits mailing list