This is an archive of the discontinued LLVM Phabricator instance.

Differential D94243

[flang][driver] Copy input files into a temp dir when testing (nfc)
ClosedPublic

Authored by awarzynski on Jan 7 2021, 9:55 AM.

Details

Reviewers
sscalpone
CarolineConcatto
FarisRehman
sameeranjoshi
SouraVX
AMDChirag
kiranktp
Commits
rG8298ec2d6299: [flang][driver] Copy input files into a temp dir when testing
Summary

The following frontend driver invocation will generate 2 output files
in the same directory as the input files:

flang-new -fc1 input-1.f input-2.f

This is the desired behaviour. However, when testing we need to make
sure that we don't pollute the source directory. To this end, copy test
input files into a temporary directory.

Diff Detail

Event Timeline

awarzynski created this revision.Jan 7 2021, 9:55 AM
Herald added a reviewer: sscalpone. · View Herald TranscriptJan 7 2021, 9:55 AM
awarzynski requested review of this revision.Jan 7 2021, 9:55 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 7 2021, 9:55 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
awarzynski retitled this revision from [flang][driver] Copy input files into a temp dir when testing to [flang][driver] Copy input files into a temp dir when testing (nfc).Jan 7 2021, 9:58 AM
awarzynski added reviewers: CarolineConcatto, FarisRehman, sameeranjoshi, SouraVX, AMDChirag, kiranktp.
Harbormaster completed remote builds in B84349: Diff 315171.Jan 7 2021, 10:21 AM
sameeranjoshi accepted this revision.Jan 11 2021, 4:06 AM

Looks good.

This revision is now accepted and ready to land.Jan 11 2021, 4:06 AM
Closed by commit rG8298ec2d6299: [flang][driver] Copy input files into a temp dir when testing (authored by awarzynski). · Explain WhyJan 11 2021, 6:05 AM
This revision was automatically updated to reflect the committed changes.
awarzynski added a commit: rG8298ec2d6299: [flang][driver] Copy input files into a temp dir when testing.
awarzynski mentioned this in rGb6e06a740c26: [flang][driver] Copy test file into a temp dir when testing (nfc).Jan 15 2021, 9:13 AM

Revision Contents

PathSize
flang/
test/
Frontend/
10 lines

Diff 315779

flang/test/Frontend/multiple-input-files.f90

Show All 10 Lines
! TEST 2: None of the files is processed (not possible to specify the output file when multiple input files are present) ! TEST 2: None of the files is processed (not possible to specify the output file when multiple input files are present)
! RUN: not %flang-new -test-io -o - %S/Inputs/hello-world.f90 %s 2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR ! RUN: not %flang-new -test-io -o - %S/Inputs/hello-world.f90 %s 2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
! RUN: not %flang-new -test-io -o %t %S/Inputs/hello-world.f90 %s 2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR ! RUN: not %flang-new -test-io -o %t %S/Inputs/hello-world.f90 %s 2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
!---------------------------------------- !----------------------------------------
! FLANG FRONTEND DRIVER (flang-new -fc1) ! FLANG FRONTEND DRIVER (flang-new -fc1)
!---------------------------------------- !----------------------------------------
! TEST 3: Both input files are processed ! TEST 3: Both input files are processed
! RUN: %flang-new -fc1 -test-io %S/Inputs/hello-world.f90 %s 2>&1 \ ! This particular test case generates output files in the same directory as the input files. We need to copy the input files into a
! RUN: && FileCheck %s --input-file=%S/multiple-input-files.txt --match-full-lines -check-prefix=FC1-OUTPUT1 \ ! temporary directory to avoid polluting the source directory.
! RUN: && FileCheck %s --input-file=%S/Inputs/hello-world.txt --match-full-lines -check-prefix=FC1-OUTPUT2 ! RUN: rm -rf %t-dir && mkdir -p %t-dir && cd %t-dir
! RUN: cp %s . && cp %S/Inputs/hello-world.f90 .
! RUN: %flang-new -fc1 -test-io hello-world.f90 multiple-input-files.f90 2>&1 \
! RUN: && FileCheck %s --input-file=multiple-input-files.txt --match-full-lines -check-prefix=FC1-OUTPUT1 \
! RUN: && FileCheck %s --input-file=hello-world.txt --match-full-lines -check-prefix=FC1-OUTPUT2
! TEST 4: Only the last input file is processed ! TEST 4: Only the last input file is processed
! RUN: %flang-new -fc1 -test-io %s %S/Inputs/hello-world.f90 -o %t 2>&1 \ ! RUN: %flang-new -fc1 -test-io %s %S/Inputs/hello-world.f90 -o %t 2>&1 \
! RUN: && FileCheck %s --input-file=%t --match-full-lines -check-prefix=FC1-OUTPUT3 ! RUN: && FileCheck %s --input-file=%t --match-full-lines -check-prefix=FC1-OUTPUT3
!----------------------- !-----------------------
! EXPECTED OUTPUT ! EXPECTED OUTPUT
!----------------------- !-----------------------
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines