[flang][nfc] Relocate a few driver tests

[awarzynski]

Summary

When the work on the Flang driver started, we created 2 test
directories:

• flang/test/Frontend/
• flang/test/Driver/

That was mostly done to model what Clang was doing. In practice, we
stopped using "flang/test/Frontend/" early on and most Flang driver
tests are currently located in "flang/test/Driver/". This patch moves
the remaining tests from the former into the latter directory.

This change also means that we can re-use test input files, i.e.
flang/test/Frontend/Inputs/hello-world.f90 can be replaced with
flang/test/Driver/Inputs/hello.f90. To this end, the affected test is
updated (multiple-input-files.f90).

[DavidSpickett]

In practice, we stopped using "flang/test/Frontend/" early on and most Flang driver tests are currently located in "flang/test/Driver/". This patch moves the remaining tests from the latter into the former directory.

Which implies from Driver to Frontend but this moves them from Frontend to Driver. "from the former into the latter"?

[awarzynski]

In D130633#3682301, @DavidSpickett wrote:

In practice, we stopped using "flang/test/Frontend/" early on and most Flang driver tests are currently located in "flang/test/Driver/". This patch moves the remaining tests from the latter into the former directory.

Which implies from Driver to Frontend but this moves them from Frontend to Driver. "from the former into the latter"?

Thanks, fixed!

[DavidSpickett]

@awarzynski Did this fall off your radar?

[awarzynski]

In D130633#3842411, @DavidSpickett wrote:

@awarzynski Did this fall off your radar?

Ah, sorry! ping :)

[DavidSpickett]

Logic for the change seems sound, this LGTM but I'll leave it open to keep it on review queues if anyone flang specific has input.

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

53

Any reason to care that these disappeared?

I guess not, they're nothing to do with there being multiple input files as far as I can tell.

[awarzynski]

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

53

With this change, this test is now using

• "flang/test/Driver/Inputs/hello.f90", instead of
• "flang/test/Frontend/Inputs/hello-world.f90".

And the two files are only *alnost* identical. That's the reason :)

[Leporacanthicus]

LGTM.

flang/test/Driver/Inputs/hello.f90

 program hello
-  write (*,*), "hello world" 
+  write(*,*), "Hello world!"
 end program hello

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

 
 !--------------------------
 ! FLANG DRIVER (flang)
 !--------------------------
 ! NOTE: Use `-E` so that the compiler driver stops after the 1st compilation phase, preprocessing. That's all we need.
 
 ! TEST 1: Both input files are processed (output is printed to stdout)
-! RUN: %flang -E %s %S/Inputs/hello-world.f90 | FileCheck %s --match-full-lines -check-prefix=FLANG
+! RUN: %flang -E %s %S/Inputs/hello.f90 | FileCheck %s --match-full-lines -check-prefix=FLANG
 
 ! TEST 2: None of the files is processed (not possible to specify the output file when multiple input files are present)
-! RUN: not %flang -E -o - %S/Inputs/hello-world.f90 %s  2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
-! RUN: not %flang -E -o %t %S/Inputs/hello-world.f90 %s 2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
+! RUN: not %flang -E -o - %S/Inputs/hello.f90 %s  2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
+! RUN: not %flang -E -o %t %S/Inputs/hello.f90 %s 2>&1 | FileCheck %s --match-full-lines -check-prefix=ERROR
 
 !----------------------------------------
 ! FLANG FRONTEND DRIVER (flang -fc1)
 !----------------------------------------
 ! TEST 3: Both input files are processed
 ! This particular test case generates output files in the same directory as the input files. We need to copy the input files into a
 ! temporary directory to avoid polluting the source directory.
 ! RUN: rm -rf %t-dir && mkdir -p %t-dir && cd %t-dir
-! RUN: cp %s . && cp %S/Inputs/hello-world.f90 .
-! RUN: %flang_fc1 -test-io  hello-world.f90 multiple-input-files.f90 2>&1 \
+! RUN: cp %s . && cp %S/Inputs/hello.f90 .
+! RUN: %flang_fc1 -test-io  hello.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
+! RUN:  && FileCheck %s --input-file=hello.txt --match-full-lines -check-prefix=FC1-OUTPUT2
 
 ! TEST 4: Only the last input file is processed
-! RUN: %flang_fc1 -test-io %s %S/Inputs/hello-world.f90 -o %t 2>&1 \
+! RUN: %flang_fc1 -test-io %s %S/Inputs/hello.f90 -o %t 2>&1 \
 ! RUN:  && FileCheck %s --input-file=%t --match-full-lines -check-prefix=FC1-OUTPUT3
 
 ! TEST 1: By default, `flang` prints the output from all input files to
 ! stdout
 ! FLANG-LABEL: Program arithmetic
 ! FLANG-NEXT:    Integer :: i, j
 ! FLANG-NEXT:    i = 2; j = 3; i= i * j;
 ! FLANG-NEXT:  End Program arithmetic
 
 ! FLANG-LABEL: program hello
-! FLANG-NEXT:  implicit none
-! FLANG-NEXT:  write(*,*) 'Hello world!'
+! FLANG-NEXT:  write(*,*), "Hello world!"
 ! FLANG-NEXT:end program hello
 
 ! TEST 2: `-o` does not when multiple input files are present
 ! ERROR: flang-new: error: cannot specify -o when generating multiple output files
 
 ! TEST 3: The output file _was not_ specified - `flang_fc1` will process all
 ! input files and generate one output file for every input file.
 ! FC1-OUTPUT1-LABEL: Program arithmetic
 ! FC1-OUTPUT1-NEXT:    Integer :: i, j
 ! FC1-OUTPUT1-NEXT:    i = 2; j = 3; i= i * j;
 ! FC1-OUTPUT1-NEXT:  End Program arithmetic
 
 ! FC1-OUTPUT2-LABEL:program hello
-! FC1-OUTPUT2-NEXT:  implicit none
-! FC1-OUTPUT2-NEXT:  write(*,*) 'Hello world!'
+! FC1-OUTPUT2-NEXT:  write(*,*), "Hello world!"
 ! FC1-OUTPUT2-NEXT:end program hello
 
 ! TEST 4: The output file _was_ specified - `flang_fc1` will process only
 ! the last input file and generate the corresponding output.
 ! FC1-OUTPUT3-LABEL:program hello
-! FC1-OUTPUT3-NEXT:  implicit none
-! FC1-OUTPUT3-NEXT:  write(*,*) 'Hello world!'
+! FC1-OUTPUT3-NEXT:  write(*,*), "Hello world!"
 ! FC1-OUTPUT3-NEXT:end program hello
 
 
 Program arithmetic
   Integer :: i, j
   i = 2; j = 3; i= i * j;
 End Program arithmetic

flang/test/Frontend/Inputs/hello-world.f90

-!This is a test file with a hello world in Fortran
-program hello
-  implicit none
-  write(*,*) 'Hello world!'
-end program hello