This is an archive of the discontinued LLVM Phabricator instance.

[flang][NFC] Simplify semantics test scripts
ClosedPublic

Authored by tskeith on May 8 2020, 9:18 AM.

Details

Summary

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.

Diff Detail

Event Timeline

tskeith created this revision.May 8 2020, 9:18 AM
Herald added a project: Restricted Project. · View Herald Transcript
PeteSteinfeld accepted this revision.May 11 2020, 9:02 AM

LGTM

Thanks for doing this.

I've verified that everything builds and tests correctly on my system.

This revision is now accepted and ready to land.May 11 2020, 9:02 AM
This revision was automatically updated to reflect the committed changes.
flang/test/Evaluate/test_folding.sh