[flang][driver] Modify the existing test cases that use -Mstandard in f18, to use -pedantic and %flang_fc1 to share with the new driver

[arnamoy10]

Summary

[flang][driver] Modify the existing test cases that use -Mstandard in f18, to use -pedantic and %flang_fc1 to share with the new driver

One of the test cases (flang/test/Semantics/dosemantics03.f90) fails currently when tested against the new driver as -Werror is used in addition to -pedantic in that test. When -Werror lands (https://reviews.llvm.org/D98657) for the new driver, this error will go away.

[awarzynski]

Thank you for working on this! I would be tempted to make this patch depend on https://reviews.llvm.org/D98657. It's up to you.

[nit] I think that it's worth shortening the commit summary (i.e. the first line). Perhaps this: [flang][driver] Port tests to use -pedantic` instead of -Mstandard. Shorter messages do make git log easier to navigate. You could move the contents of your top line to the summary.

As the above are nits, accepting as is!

flang/test/Semantics/canondo07.f90

 ! Error test -- DO loop uses obsolete loop termination statement
 ! See R1131 and C1131
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>&1 | FileCheck %s
 ! CHECK: A DO loop should terminate with an END DO or CONTINUE
 
 program endDo
   do 10 i = 1, 5
 10  print *, "in loop"
 end program endDo

flang/test/Semantics/canondo08.f90

 ! Error test -- DO loop uses obsolete loop termination statement
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo09.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
 ! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
 ! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo0()
   do  01 j=1,2
     if (.true.) then
 01  end if
 end subroutine

flang/test/Semantics/canondo10.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo11.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo12.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo13.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo14.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo15.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo16.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo17.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo18.f90

 ! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
-! A warning is generated with -Mstandard
+! A warning is generated with -pedantic
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
 ! The following CHECK-NOT actively uses the fact that the leading zero of labels
 ! would be removed in the unparse but not the line linked to warnings. We do
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/canondo19.f90

 ! Check that if there is a label or a name on an label-do-stmt,
 ! then it is not lost when rewriting it to an non-label-do-stmt.
 
-! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>&1 | FileCheck %s
 
 ! CHECK: end do
 ! CHECK: 2 do
 ! CHECK: mainloop: do
 ! CHECK: end do mainloop
 
 ! CHECK-NOT: do [1-9]
 

flang/test/Semantics/dosemantics03.f90

-! RUN: %S/test_errors.sh %s %t %f18 -Mstandard -Werror
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -pedantic -Werror
 
 ! Issue 458 -- semantic checks for a normal DO loop.  The DO variable
 ! and the initial, final, and step expressions must be INTEGER if the
 ! options for standard conformance and turning warnings into errors
 ! are both in effect.  This test turns on the options for standards
 ! conformance and turning warnings into errors.  This produces error
 ! messages for the cases where REAL and DOUBLE PRECISION variables
 ! and expressions are used in the DO controls.

flang/test/Semantics/io10.f90

-! RUN: %S/test_errors.sh %s %t %f18 -Mstandard
+! RUN: %S/test_errors.sh %s %t %flang_fc1 -pedantic
 
   write(*, '(B0)')
   write(*, '(B3)')
 
   !WARNING: Expected 'B' edit descriptor 'w' value
   write(*, '(B)')
 
   !WARNING: Expected 'EN' edit descriptor 'w' value

flang/test/Semantics/label01.F90

-! RUN: %f18 -funparse-with-symbols -DSTRICT_F18 -Mstandard %s 2>&1 | FileCheck %s
-! RUN: %f18 -funparse-with-symbols -DARCHAIC_FORTRAN %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -DSTRICT_F18 -pedantic %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -DARCHAIC_FORTRAN %s 2>&1 | FileCheck %s
 ! CHECK-NOT: :{{[[:space:]]}}error:{{[[:space:]]}}
 ! FIXME: the above check line does not work because diags are not emitted with error: in them.
 
 ! these are the conformance tests
 ! define STRICT_F18 to eliminate tests of features not in F18
 ! define ARCHAIC_FORTRAN to add test of feature found in Fortran before F95
 
 subroutine sub00(a,b,n,m)

 #ifndef STRICT_F18
 ! extended ranges supported by PGI, gfortran gives warnings
 subroutine do_loop09(a,n,j)
   integer :: n
   real a(n)
   goto 400
 200 print *, "found the index", j
   print *, "value at", j, "is", a(j)
-  goto 300 ! FIXME: emits diagnostic even without -Mstandard
+  goto 300 ! FIXME: emits diagnostic even without -pedantic
 400  do 100 i = 1, n
      if (i .eq. j) then
         goto 200  ! extension: extended GOTO ranges
 300     continue
      else
         print *, a(i)
      end if
 100 end do

flang/test/Semantics/resolve103.f90

-! RUN: not %f18 -Mstandard %s 2>&1 | FileCheck %s
+! RUN: not %flang_fc1 -pedantic %s 2>&1 | FileCheck %s
 ! Test extension: allow forward references to dummy arguments
 ! from specification expressions in scopes with IMPLICIT NONE(TYPE),
 ! as long as those symbols are eventually typed later with the
 ! same integer type they would have had without IMPLICIT NONE.
 
 !CHECK: Dummy argument 'n1' was used without being explicitly typed
 !CHECK: error: No explicit type declared for dummy argument 'n1'
 subroutine foo1(a, n1)
   implicit none
   real a(n1)
 end
 
 !CHECK: Dummy argument 'n2' was used without being explicitly typed
 subroutine foo2(a, n2)
   implicit none
   real a(n2)
 !CHECK: error: The type of 'n2' has already been implicitly declared
   double precision n2
 end
 
 !CHECK: Dummy argument 'n3' was used without being explicitly typed
-!CHECK-NOT: error:
+!CHECK-NOT: error: Dummy argument 'n3'
 subroutine foo3(a, n3)
   implicit none
   real a(n3)
   integer n3
 end