[flang][test] Remove RUN COMMAND/EXPECTED OUTPUT/INPUT markers from other directories

diff --git a/flang/test/Driver/driver-error-cc1.c b/flang/test/Driver/driver-error-cc1.c
index 41562e5..5fc75b0 100644 (file)
--- a/flang/test/Driver/driver-error-cc1.c
+++ b/flang/test/Driver/driver-error-cc1.c
@@ -1,12 +1,6 @@
 // C files are currently not supported (i.e. `flang -cc1`). Make sure that the
 // driver reports this as expected.
 
-//-----------
-// RUN LINES
-//-----------
 // RUN: not %flang %s 2>&1 | FileCheck %s
 
-//-----------------------
-// EXPECTED OUTPUT
-//-----------------------
 // CHECK: error: unknown integrated tool '-cc1'. Valid tools include '-fc1'.

diff --git a/flang/test/Driver/driver-error-cc1.cpp b/flang/test/Driver/driver-error-cc1.cpp
index 61ee482..2a6ecdb 100644 (file)
--- a/flang/test/Driver/driver-error-cc1.cpp
+++ b/flang/test/Driver/driver-error-cc1.cpp
@@ -1,12 +1,6 @@
 // C++ files are currently not supported (i.e. `flang -cc1`). Make sure that the
 // driver reports this as expected.
 
-//-----------
-// RUN LINES
-//-----------
 // RUN: not %flang %s 2>&1 | FileCheck %s
 
-//-----------------------
-// EXPECTED OUTPUT
-//-----------------------
 // CHECK: error: unknown integrated tool '-cc1'. Valid tools include '-fc1'.

diff --git a/flang/test/Examples/print-fns-calls.f90 b/flang/test/Examples/print-fns-calls.f90
index 4702e1b..426de00 100644 (file)
--- a/flang/test/Examples/print-fns-calls.f90
+++ b/flang/test/Examples/print-fns-calls.f90
@@ -5,15 +5,9 @@
 
 ! RUN: %flang_fc1 -load %llvmshlibdir/flangPrintFunctionNames%pluginext -plugin print-fns %s 2>&1 | FileCheck %s
 
-!-----------------------------
-! EXPECTED OUTPUT: Counts == 0
-!-----------------------------
 ! CHECK: ==== Functions: 0 ====
 ! CHECK-NEXT: ==== Subroutines: 0 ====
 
-!-----------------------------
-! INPUT
-!-----------------------------
 program main
     call subroutine1
     fn1 = function1()

diff --git a/flang/test/Examples/print-fns-definitions.f90 b/flang/test/Examples/print-fns-definitions.f90
index fc8fcb2..98b8e64 100644 (file)
--- a/flang/test/Examples/print-fns-definitions.f90
+++ b/flang/test/Examples/print-fns-definitions.f90
@@ -6,9 +6,6 @@
 
 ! RUN: %flang_fc1 -load %llvmshlibdir/flangPrintFunctionNames%pluginext -plugin print-fns %s 2>&1 | FileCheck %s
 
-!-------------------------------------------------
-! EXPECTED OUTPUT: Names printed and counts != 0
-!-------------------------------------------------
 ! CHECK: Function: external_func1
 ! CHECK-NEXT: Function: external_func2
 ! CHECK-NEXT: Subroutine: external_subr
@@ -18,9 +15,6 @@
 ! CHECK-NEXT: ==== Functions: 3 ====
 ! CHECK-NEXT: ==== Subroutines: 2 ====
 
-!--------------------------
-! INPUT
-!--------------------------
 function external_func1()
 end function
 

diff --git a/flang/test/Examples/print-fns-interfaces.f90 b/flang/test/Examples/print-fns-interfaces.f90
index 39a2bf3..0813fd4 100644 (file)
--- a/flang/test/Examples/print-fns-interfaces.f90
+++ b/flang/test/Examples/print-fns-interfaces.f90
@@ -6,15 +6,9 @@
 
 ! RUN: %flang_fc1 -load %llvmshlibdir/flangPrintFunctionNames%pluginext -plugin print-fns %s 2>&1 | FileCheck %s
 
-!-----------------------------
-! EXPECTED OUTPUT: Counts == 0
-!-----------------------------
 ! CHECK: ==== Functions: 0 ====
 ! CHECK-NEXT: ==== Subroutines: 0 ====
 
-!--------------------------
-! INPUT
-!--------------------------
 program main
     interface
         function interface_func()

diff --git a/flang/test/Frontend/input-output-file.f90 b/flang/test/Frontend/input-output-file.f90
index d7aaac7..888082a 100644 (file)
--- a/flang/test/Frontend/input-output-file.f90
+++ b/flang/test/Frontend/input-output-file.f90
@@ -26,9 +26,6 @@
 ! TEST 5: Write to a file (explicit)
 ! RUN: %flang_fc1 -test-io  -o %t %s 2>&1 && FileCheck %s --match-full-lines --input-file=%t
 
-!-----------------------
-! EXPECTED OUTPUT
-!-----------------------
 ! CHECK-LABEL: Program arithmetic
 ! CHECK-NEXT:    Integer :: i, j
 ! CHECK-NEXT:    i = 2; j = 3; i= i * j;

diff --git a/flang/test/Frontend/multiple-input-files.f90 b/flang/test/Frontend/multiple-input-files.f90
index 95cea4f..251931e 100644 (file)
--- a/flang/test/Frontend/multiple-input-files.f90
+++ b/flang/test/Frontend/multiple-input-files.f90
@@ -27,9 +27,6 @@
 ! RUN: %flang_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
 
-!-----------------------
-! EXPECTED OUTPUT
-!-----------------------
 ! TEST 1: By default, `flang` prints the output from all input files to
 ! stdout
 ! FLANG-LABEL: Program arithmetic

diff --git a/flang/test/Frontend/prescanner-diag.f90 b/flang/test/Frontend/prescanner-diag.f90
index 0794977..e133628 100644 (file)
--- a/flang/test/Frontend/prescanner-diag.f90
+++ b/flang/test/Frontend/prescanner-diag.f90
@@ -4,9 +4,6 @@
 ! needs to make sure that the diagnostics are indeed issued (rather that relying
 ! on some DiagnosticsEngine).
 
-!-----------
-! RUN LINES
-!-----------
 ! Test with -E (i.e. PrintPreprocessedAction, stops after prescanning)
 ! RUN: %flang -E -I %S/Inputs/ %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -E -I %S/Inputs/ %s 2>&1 | FileCheck %s
@@ -15,15 +12,9 @@
 ! RUN: %flang -fsyntax-only -I %S/Inputs/ %s 2>&1 | FileCheck %s
 ! RUN: %flang_fc1 -fsyntax-only -I %S/Inputs/ %s 2>&1 | FileCheck %s
 
-!-----------------------
-! EXPECTED OUTPUT
-!-----------------------
-! CHECK: prescanner-diag.f90:27:20: portability: #include: extra stuff ignored after file name
-! CHECK: prescanner-diag.f90:28:20: portability: #include: extra stuff ignored after file name
+! CHECK: prescanner-diag.f90:[[#@LINE+3]]:20: portability: #include: extra stuff ignored after file name
+! CHECK: prescanner-diag.f90:[[#@LINE+3]]:20: portability: #include: extra stuff ignored after file name
 
-!-------
-! INPUT
-!-------
 #include <empty.h> comment
 #include "empty.h" comment
 end