This is an archive of the discontinued LLVM Phabricator instance.

Differential D75370

[test] Fix flang test failures due to not handling .exe
AbandonedPublic

Authored by ctetreau on Feb 28 2020, 10:27 AM.

Details

Reviewers
efriedma
rsmith
peterwaller-arm
Summary
  • Update flang tests to account for the fact that the binary is called flang.exe on windows

Diff Detail

Event Timeline

ctetreau created this revision.Feb 28 2020, 10:27 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 28 2020, 10:27 AM
Herald added subscribers: cfe-commits, DavidTruby. · View Herald Transcript
ctetreau added reviewers: efriedma, rsmith, peterwaller-arm.Feb 28 2020, 10:31 AM
Harbormaster completed remote builds in B47616: Diff 247310.Feb 28 2020, 10:51 AM
efriedma added a comment.Feb 28 2020, 11:55 AM

Do you have any idea why this isn't failing on the public buildbots? There are multiple Windows buildbots that are running these tests (for example, http://lab.llvm.org:8011/builders/llvm-clang-win-x-aarch64, and http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/22371 ), and the tests are passing there.

ctetreau abandoned this revision.Apr 8 2020, 3:45 PM

Revision Contents

PathSize
clang/
test/
Driver/
flang/
2 lines
2 lines
4 lines

Diff 247310

clang/test/Driver/flang/flang.f90

! Check that flang -fc1 is invoked when in --driver-mode=flang. ! Check that flang -fc1 is invoked when in --driver-mode=flang.
! This is a copy of flang_ucase.F90 because the driver has logic in it which ! This is a copy of flang_ucase.F90 because the driver has logic in it which
! differentiates between F90 and f90 files. Flang will not treat these files ! differentiates between F90 and f90 files. Flang will not treat these files
! differently. ! differently.
! Test various output types: ! Test various output types:
! * -E ! * -E
! * -fsyntax-only ! * -fsyntax-only
! * -emit-llvm -S ! * -emit-llvm -S
! * -emit-llvm ! * -emit-llvm
! * -S ! * -S
! * (no type specified, resulting in an object file) ! * (no type specified, resulting in an object file)
! All invocations should begin with flang -fc1, consume up to here. ! All invocations should begin with flang -fc1, consume up to here.
! ALL-LABEL: "{{[^"]*}}flang" "-fc1" ! ALL-LABEL: "{{[^"]*}}flang{{(.exe)?}}" "-fc1"
! Check that f90 files are not treated as "previously preprocessed" ! Check that f90 files are not treated as "previously preprocessed"
! ... in --driver-mode=flang. ! ... in --driver-mode=flang.
! RUN: %clang --driver-mode=flang -### -E %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-E %s ! RUN: %clang --driver-mode=flang -### -E %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-E %s
! CHECK-E-NOT: previously preprocessed input ! CHECK-E-NOT: previously preprocessed input
! CHECK-E-DAG: "-E" ! CHECK-E-DAG: "-E"
! CHECK-E-DAG: "-o" "-" ! CHECK-E-DAG: "-o" "-"
Show All 27 Lines

clang/test/Driver/flang/flang_ucase.F90

! Check that flang -fc1 is invoked when in --driver-mode=flang. ! Check that flang -fc1 is invoked when in --driver-mode=flang.
! This is a copy of flang.f90 because the driver has logic in it which ! This is a copy of flang.f90 because the driver has logic in it which
! differentiates between F90 and f90 files. Flang will not treat these files ! differentiates between F90 and f90 files. Flang will not treat these files
! differently. ! differently.
! Test various output types: ! Test various output types:
! * -E ! * -E
! * -fsyntax-only ! * -fsyntax-only
! * -emit-llvm -S ! * -emit-llvm -S
! * -emit-llvm ! * -emit-llvm
! * -S ! * -S
! * (no type specified, resulting in an object file) ! * (no type specified, resulting in an object file)
! All invocations should begin with flang -fc1, consume up to here. ! All invocations should begin with flang -fc1, consume up to here.
! ALL-LABEL: "{{[^"]*}}flang" "-fc1" ! ALL-LABEL: "{{[^"]*}}flang{{(.exe)?}}" "-fc1"
! Check that f90 files are not treated as "previously preprocessed" ! Check that f90 files are not treated as "previously preprocessed"
! ... in --driver-mode=flang. ! ... in --driver-mode=flang.
! RUN: %clang --driver-mode=flang -### -E %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-E %s ! RUN: %clang --driver-mode=flang -### -E %s 2>&1 | FileCheck --check-prefixes=ALL,CHECK-E %s
! CHECK-E-NOT: previously preprocessed input ! CHECK-E-NOT: previously preprocessed input
! CHECK-E-DAG: "-E" ! CHECK-E-DAG: "-E"
! CHECK-E-DAG: "-o" "-" ! CHECK-E-DAG: "-o" "-"
Show All 27 Lines

clang/test/Driver/flang/multiple-inputs.f90

! Check that flang driver can handle multiple inputs at once. ! Check that flang driver can handle multiple inputs at once.
! RUN: %clang --driver-mode=flang -### -fsyntax-only %S/Inputs/one.f90 %S/Inputs/two.f90 2>&1 | FileCheck --check-prefixes=CHECK-SYNTAX-ONLY %s ! RUN: %clang --driver-mode=flang -### -fsyntax-only %S/Inputs/one.f90 %S/Inputs/two.f90 2>&1 | FileCheck --check-prefixes=CHECK-SYNTAX-ONLY %s
! CHECK-SYNTAX-ONLY-LABEL: "{{[^"]*}}flang" "-fc1" ! CHECK-SYNTAX-ONLY-LABEL: "{{[^"]*}}flang{{(.exe)?}}" "-fc1"
! CHECK-SYNTAX-ONLY: "{{[^"]*}}/Inputs/one.f90" ! CHECK-SYNTAX-ONLY: "{{[^"]*}}/Inputs/one.f90"
! CHECK-SYNTAX-ONLY-LABEL: "{{[^"]*}}flang" "-fc1" ! CHECK-SYNTAX-ONLY-LABEL: "{{[^"]*}}flang{{(.exe)?}}" "-fc1"
! CHECK-SYNTAX-ONLY: "{{[^"]*}}/Inputs/two.f90" ! CHECK-SYNTAX-ONLY: "{{[^"]*}}/Inputs/two.f90"