Index: flang/test/Semantics/OpenMP/omp-allocate-directive.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate-directive.f90
+++ flang/test/Semantics/OpenMP/omp-allocate-directive.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! Check OpenMP Allocate directive
 use omp_lib
 
Index: flang/test/Semantics/OpenMP/omp-allocate01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate01.f90
+++ flang/test/Semantics/OpenMP/omp-allocate01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.0
 ! 2.11.3 allocate Directive
 ! The allocate directive must appear in the same scope as the declarations of
Index: flang/test/Semantics/OpenMP/omp-allocate02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate02.f90
+++ flang/test/Semantics/OpenMP/omp-allocate02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.0
 ! 2.11.3 allocate Directive
 ! At most one allocator clause can appear on the allocate directive.
Index: flang/test/Semantics/OpenMP/omp-allocate03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate03.f90
+++ flang/test/Semantics/OpenMP/omp-allocate03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.0
 ! 2.11.3 allocate Directive
 ! A variable that is part of another variable (as an array or
Index: flang/test/Semantics/OpenMP/omp-allocate04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate04.f90
+++ flang/test/Semantics/OpenMP/omp-allocate04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.0
 ! 2.11.3 allocate Directive
 ! Only the allocator clause is allowed on the allocate directive
Index: flang/test/Semantics/OpenMP/omp-allocate05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate05.f90
+++ flang/test/Semantics/OpenMP/omp-allocate05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.0
 ! 2.11.3 allocate Directive
 ! allocate directives that appear in a target region must specify an allocator
Index: flang/test/Semantics/OpenMP/omp-allocate06.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate06.f90
+++ flang/test/Semantics/OpenMP/omp-allocate06.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.0
 ! 2.11.3 allocate Directive 
 ! List items specified in the allocate directive must not have the ALLOCATABLE attribute unless the directive is associated with an
Index: flang/test/Semantics/OpenMP/omp-allocate07.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate07.f90
+++ flang/test/Semantics/OpenMP/omp-allocate07.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.0
 ! 2.11.3 allocate Directive 
 ! A type parameter inquiry cannot appear in an allocate directive.
Index: flang/test/Semantics/OpenMP/omp-allocate08.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-allocate08.f90
+++ flang/test/Semantics/OpenMP/omp-allocate08.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.0
 ! 2.11.3 allocate Directive
 ! If list items within the ALLOCATE directive have the SAVE attribute, are a common block name, or are declared in the scope of a
Index: flang/test/Semantics/OpenMP/omp-atomic.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-atomic.f90
+++ flang/test/Semantics/OpenMP/omp-atomic.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 use omp_lib
 ! Check OpenMP 2.13.6 atomic Construct
 
Index: flang/test/Semantics/OpenMP/omp-atomic01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-atomic01.f90
+++ flang/test/Semantics/OpenMP/omp-atomic01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! Semantic checks for OpenMP 5.0 standard 2.17.7 atomic Construct.
 
 use omp_lib
Index: flang/test/Semantics/OpenMP/omp-atomic02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-atomic02.f90
+++ flang/test/Semantics/OpenMP/omp-atomic02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 
 ! OpenMP Atomic construct
 ! section 2.17.7
Index: flang/test/Semantics/OpenMP/omp-atomic03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-atomic03.f90
+++ flang/test/Semantics/OpenMP/omp-atomic03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 
 ! OpenMP Atomic construct
 ! section 2.17.7
Index: flang/test/Semantics/OpenMP/omp-atomic04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-atomic04.f90
+++ flang/test/Semantics/OpenMP/omp-atomic04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 
 ! OpenMP Atomic construct
 ! section 2.17.7
Index: flang/test/Semantics/OpenMP/omp-atomic05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-atomic05.f90
+++ flang/test/Semantics/OpenMP/omp-atomic05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! This tests the various semantics related to the clauses of various OpenMP atomic constructs
 
Index: flang/test/Semantics/OpenMP/omp-clause-validity01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-clause-validity01.f90
+++ flang/test/Semantics/OpenMP/omp-clause-validity01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 use omp_lib
 ! Check OpenMP clause validity for the following directives:
 !
Index: flang/test/Semantics/OpenMP/omp-combined-constructs.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-combined-constructs.f90
+++ flang/test/Semantics/OpenMP/omp-combined-constructs.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 program main
   implicit none
Index: flang/test/Semantics/OpenMP/omp-copyin01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-copyin01.f90
+++ flang/test/Semantics/OpenMP/omp-copyin01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.4.1 copyin Clause
 ! A list item that appears in a copyin clause must be threadprivate
Index: flang/test/Semantics/OpenMP/omp-copyin02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-copyin02.f90
+++ flang/test/Semantics/OpenMP/omp-copyin02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.4.1 copyin Clause
 ! A common block name that appears in a copyin clause must be declared to be
Index: flang/test/Semantics/OpenMP/omp-copyin03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-copyin03.f90
+++ flang/test/Semantics/OpenMP/omp-copyin03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.4.1 copyin Clause
 ! A list item that appears in a copyin clause must be threadprivate.
Index: flang/test/Semantics/OpenMP/omp-copyin04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-copyin04.f90
+++ flang/test/Semantics/OpenMP/omp-copyin04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.4.1 copyin Clause
 ! A list item that appears in a copyin clause must be threadprivate
Index: flang/test/Semantics/OpenMP/omp-copyin05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-copyin05.f90
+++ flang/test/Semantics/OpenMP/omp-copyin05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.4.1 copyin Clause
 ! A common block name that appears in a copyin clause must be declared to be
Index: flang/test/Semantics/OpenMP/omp-copyprivate01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-copyprivate01.f90
+++ flang/test/Semantics/OpenMP/omp-copyprivate01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.4.2 copyprivate Clause
 ! A list item that appears in a copyprivate clause may not appear in a
Index: flang/test/Semantics/OpenMP/omp-copyprivate02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-copyprivate02.f90
+++ flang/test/Semantics/OpenMP/omp-copyprivate02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.4.2 copyprivate Clause
 ! Pointers with the INTENT(IN) attribute may not appear in a copyprivate clause.
Index: flang/test/Semantics/OpenMP/omp-copyprivate03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-copyprivate03.f90
+++ flang/test/Semantics/OpenMP/omp-copyprivate03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.4.2 copyprivate Clause
 ! All list items that appear in the copyprivate clause must be either
Index: flang/test/Semantics/OpenMP/omp-declarative-directive.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-declarative-directive.f90
+++ flang/test/Semantics/OpenMP/omp-declarative-directive.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! Check OpenMP declarative directives
 
Index: flang/test/Semantics/OpenMP/omp-declare-target01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-declare-target01.f90
+++ flang/test/Semantics/OpenMP/omp-declare-target01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.14.7 Declare Target Directive
Index: flang/test/Semantics/OpenMP/omp-declare-target02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-declare-target02.f90
+++ flang/test/Semantics/OpenMP/omp-declare-target02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.14.7 Declare Target Directive
Index: flang/test/Semantics/OpenMP/omp-declare-target03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-declare-target03.f90
+++ flang/test/Semantics/OpenMP/omp-declare-target03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.14.7 Declare Target Directive
Index: flang/test/Semantics/OpenMP/omp-declare-target04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-declare-target04.f90
+++ flang/test/Semantics/OpenMP/omp-declare-target04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.14.7 Declare Target Directive
Index: flang/test/Semantics/OpenMP/omp-declare-target05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-declare-target05.f90
+++ flang/test/Semantics/OpenMP/omp-declare-target05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.14.7 Declare Target Directive
Index: flang/test/Semantics/OpenMP/omp-default.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-default.f90
+++ flang/test/Semantics/OpenMP/omp-default.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.1 default Clause
 program omp_default
Index: flang/test/Semantics/OpenMP/omp-default02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-default02.f90
+++ flang/test/Semantics/OpenMP/omp-default02.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.1 default Clause - a positive test case.
 
Index: flang/test/Semantics/OpenMP/omp-depend01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-depend01.f90
+++ flang/test/Semantics/OpenMP/omp-depend01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.13.9 Depend Clause
 ! List items used in depend clauses cannot be zero-length array sections.
Index: flang/test/Semantics/OpenMP/omp-depend02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-depend02.f90
+++ flang/test/Semantics/OpenMP/omp-depend02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.13.9 Depend Clause
 ! A variable that is part of another variable
Index: flang/test/Semantics/OpenMP/omp-depend03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-depend03.f90
+++ flang/test/Semantics/OpenMP/omp-depend03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.13.9 Depend Clause
 ! Coarrays are not supported in depend clause
Index: flang/test/Semantics/OpenMP/omp-device-constructs.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-device-constructs.f90
+++ flang/test/Semantics/OpenMP/omp-device-constructs.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! Check OpenMP clause validity for the following directives:
 !     2.10 Device constructs
 program main
Index: flang/test/Semantics/OpenMP/omp-do-collapse-positivecases.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-collapse-positivecases.f90
+++ flang/test/Semantics/OpenMP/omp-do-collapse-positivecases.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Collapse Clause Positive cases
 
Index: flang/test/Semantics/OpenMP/omp-do-collapse.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-collapse.f90
+++ flang/test/Semantics/OpenMP/omp-do-collapse.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Collapse Clause
 program omp_doCollapse
Index: flang/test/Semantics/OpenMP/omp-do-cycle.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-cycle.f90
+++ flang/test/Semantics/OpenMP/omp-do-cycle.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! Check for cycle statements leaving an OpenMP structured block
 
Index: flang/test/Semantics/OpenMP/omp-do-ordered-positivecases.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-ordered-positivecases.f90
+++ flang/test/Semantics/OpenMP/omp-do-ordered-positivecases.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Ordered Clause positive cases.
 
Index: flang/test/Semantics/OpenMP/omp-do-ordered.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-ordered.f90
+++ flang/test/Semantics/OpenMP/omp-do-ordered.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Ordered Clause
 
Index: flang/test/Semantics/OpenMP/omp-do-schedule01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-schedule01.f90
+++ flang/test/Semantics/OpenMP/omp-do-schedule01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Schedule Clause
 program omp_doSchedule
Index: flang/test/Semantics/OpenMP/omp-do-schedule02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-schedule02.f90
+++ flang/test/Semantics/OpenMP/omp-do-schedule02.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Schedule Clause
 program omp_doSchedule
Index: flang/test/Semantics/OpenMP/omp-do-schedule03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-schedule03.f90
+++ flang/test/Semantics/OpenMP/omp-do-schedule03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Schedule Clause
 ! Test that does not catch non constant integer expressions like xx - xx.
Index: flang/test/Semantics/OpenMP/omp-do-schedule04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do-schedule04.f90
+++ flang/test/Semantics/OpenMP/omp-do-schedule04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Schedule Clause
 ! Test that does not catch non constant integer expressions like xx - yy.
Index: flang/test/Semantics/OpenMP/omp-do01-positivecase.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do01-positivecase.f90
+++ flang/test/Semantics/OpenMP/omp-do01-positivecase.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The loop iteration variable may not appear in a firstprivate directive.
Index: flang/test/Semantics/OpenMP/omp-do01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do01.f90
+++ flang/test/Semantics/OpenMP/omp-do01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The loop iteration variable may not appear in a firstprivate directive.
Index: flang/test/Semantics/OpenMP/omp-do03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do03.f90
+++ flang/test/Semantics/OpenMP/omp-do03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
Index: flang/test/Semantics/OpenMP/omp-do04-positivecase.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do04-positivecase.f90
+++ flang/test/Semantics/OpenMP/omp-do04-positivecase.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop Constructs
 
Index: flang/test/Semantics/OpenMP/omp-do04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do04.f90
+++ flang/test/Semantics/OpenMP/omp-do04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The loop iteration variable may not appear in a threadprivate directive.
Index: flang/test/Semantics/OpenMP/omp-do05-positivecase.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do05-positivecase.f90
+++ flang/test/Semantics/OpenMP/omp-do05-positivecase.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct restrictions on single directive.
 ! A positive case
Index: flang/test/Semantics/OpenMP/omp-do05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do05.f90
+++ flang/test/Semantics/OpenMP/omp-do05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct restrictions on single directive.
 
Index: flang/test/Semantics/OpenMP/omp-do06-positivecases.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do06-positivecases.f90
+++ flang/test/Semantics/OpenMP/omp-do06-positivecases.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The ordered clause must be present on the loop construct if any ordered
Index: flang/test/Semantics/OpenMP/omp-do06.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do06.f90
+++ flang/test/Semantics/OpenMP/omp-do06.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The ordered clause must be present on the loop construct if any ordered
Index: flang/test/Semantics/OpenMP/omp-do08.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do08.f90
+++ flang/test/Semantics/OpenMP/omp-do08.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 
Index: flang/test/Semantics/OpenMP/omp-do09.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do09.f90
+++ flang/test/Semantics/OpenMP/omp-do09.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The do-loop cannot be a DO WHILE or a DO loop without loop control.
Index: flang/test/Semantics/OpenMP/omp-do10.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do10.f90
+++ flang/test/Semantics/OpenMP/omp-do10.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 ! The DO loop iteration variable must be of type integer.
Index: flang/test/Semantics/OpenMP/omp-do11.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do11.f90
+++ flang/test/Semantics/OpenMP/omp-do11.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop Constructs
 
Index: flang/test/Semantics/OpenMP/omp-do12.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do12.f90
+++ flang/test/Semantics/OpenMP/omp-do12.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop constructs.
 
Index: flang/test/Semantics/OpenMP/omp-do13.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do13.f90
+++ flang/test/Semantics/OpenMP/omp-do13.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 
Index: flang/test/Semantics/OpenMP/omp-do14.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do14.f90
+++ flang/test/Semantics/OpenMP/omp-do14.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop constructs.
 
Index: flang/test/Semantics/OpenMP/omp-do15.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do15.f90
+++ flang/test/Semantics/OpenMP/omp-do15.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 
Index: flang/test/Semantics/OpenMP/omp-do16.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do16.f90
+++ flang/test/Semantics/OpenMP/omp-do16.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Loop Construct
 
Index: flang/test/Semantics/OpenMP/omp-do17.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-do17.f90
+++ flang/test/Semantics/OpenMP/omp-do17.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.1 Do Loop constructs.
 
Index: flang/test/Semantics/OpenMP/omp-do18.f90
===================================================================
--- /dev/null
+++ flang/test/Semantics/OpenMP/omp-do18.f90
@@ -0,0 +1,40 @@
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
+! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
+! CHECK-NOT: do *[1-9]
+
+program P
+implicit none
+integer OMP_GET_NUM_THREADS, OMP_GET_THREAD_NUM
+integer NUMTHRDS, TID
+integer N, CSZ, CNUM, I
+parameter (N=100)
+parameter (CSZ=10) 
+real A(N), B(N), C(N)
+
+do 10 I = 1, N
+   A(I) = I * 1.0
+10 continue
+
+B = A
+CNUM = CSZ
+
+!$OMP PARALLEL SHARED(A,B,C,NUMTHRDS,CNUM) PRIVATE(I,TID)
+TID = OMP_GET_THREAD_NUM()
+if (TID .EQ. 0) then
+   NUMTHRDS = OMP_GET_NUM_THREADS()
+   print *, "Number of threads =", NUMTHRDS
+end if
+print *, "Thread", TID, " is starting..."
+
+!$OMP DO SCHEDULE(DYNAMIC,CNUM)
+do 20 I = 1, N
+   C(I) = A(I) + B(I)
+   write (*,100) TID, I, C(I)
+20 continue
+!$OMP END DO NOWAIT
+
+print *, "Thread", TID, " done."
+
+!$OMP END PARALLEL
+100 format(" Thread", I2, ": C(", I3, ")=", F8.2)
+end program P
Index: flang/test/Semantics/OpenMP/omp-do19.f90
===================================================================
--- /dev/null
+++ flang/test/Semantics/OpenMP/omp-do19.f90
@@ -0,0 +1,25 @@
+! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
+! CHECK-NOT: do *[1-9]
+! CHECK: omp simd
+
+program P
+implicit none
+integer N, I
+parameter (N=100)
+real A(N), B(N), C(N)
+
+!$OMP SIMD
+do 10 I = 1, N
+   A(I) = I * 1.0
+10 continue
+
+B = A
+
+!$OMP SIMD
+do 20 I = 1, N
+   C(I) = A(I) + B(I)
+   write (*,100) I, C(I)
+20 continue
+
+100 format(" C(", I3, ")=", F8.2)
+end program P
Index: flang/test/Semantics/OpenMP/omp-firstprivate01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-firstprivate01.f90
+++ flang/test/Semantics/OpenMP/omp-firstprivate01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.4 firstprivate Clause
 ! Variables that appear in a firstprivate clause on a distribute or
Index: flang/test/Semantics/OpenMP/omp-flush01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-flush01.f90
+++ flang/test/Semantics/OpenMP/omp-flush01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! 2.17.8 Flush construct [OpenMP 5.0]
 !        memory-order-clause ->
Index: flang/test/Semantics/OpenMP/omp-flush02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-flush02.f90
+++ flang/test/Semantics/OpenMP/omp-flush02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 
 ! Check OpenMP 5.0 - 2.17.8 flush Construct
 ! Restriction -
Index: flang/test/Semantics/OpenMP/omp-lastprivate01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-lastprivate01.f90
+++ flang/test/Semantics/OpenMP/omp-lastprivate01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.5 lastprivate Clause
 ! A variable that appears in a lastprivate clause must be definable.
Index: flang/test/Semantics/OpenMP/omp-lastprivate02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-lastprivate02.f90
+++ flang/test/Semantics/OpenMP/omp-lastprivate02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.5 lastprivate Clause
 ! A list item that is private within a parallel region, or that appears in
Index: flang/test/Semantics/OpenMP/omp-linear-iter.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-linear-iter.f90
+++ flang/test/Semantics/OpenMP/omp-linear-iter.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! Various checks with the ordered construct
 
Index: flang/test/Semantics/OpenMP/omp-loop-association.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-loop-association.f90
+++ flang/test/Semantics/OpenMP/omp-loop-association.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! Check the association between OpenMPLoopConstruct and DoConstruct
 
Index: flang/test/Semantics/OpenMP/omp-loop-simd01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-loop-simd01.f90
+++ flang/test/Semantics/OpenMP/omp-loop-simd01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 4.5
 ! 2.8.3 Loop simd Construct
Index: flang/test/Semantics/OpenMP/omp-modfile-threadprivate.f90
===================================================================
--- /dev/null
+++ flang/test/Semantics/OpenMP/omp-modfile-threadprivate.f90
@@ -0,0 +1,35 @@
+! RUN: %python %S/../test_modfile.py %s %flang_fc1 -fopenmp
+! Check correct modfile generation for OpenMP threadprivate directive.
+
+module m
+  implicit none
+  type :: my_type(kind_param, len_param)
+    integer, KIND :: kind_param
+    integer, LEN :: len_param
+    integer :: t_i
+    integer :: t_arr(10)
+  end type
+  type(my_type(kind_param=2, len_param=4)) :: t
+  real, dimension(3) :: thrtest
+  real :: x
+  common /blk/ x
+
+  !$omp threadprivate(thrtest, t, /blk/)
+end
+
+!Expect: m.mod
+!module m
+!type::my_type(kind_param,len_param)
+!integer(4),kind::kind_param
+!integer(4),len::len_param
+!integer(4)::t_i
+!integer(4)::t_arr(1_8:10_8)
+!end type
+!type(my_type(kind_param=2_4,len_param=4_4))::t
+!!$omp threadprivate(t)
+!real(4)::thrtest(1_8:3_8)
+!!$omp threadprivate(thrtest)
+!real(4)::x
+!!$omp threadprivate(x)
+!common/blk/x
+!end
Index: flang/test/Semantics/OpenMP/omp-nested-barrier.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested-barrier.f90
+++ flang/test/Semantics/OpenMP/omp-nested-barrier.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! Various checks with the nesting of BARRIER construct
 
Index: flang/test/Semantics/OpenMP/omp-nested-cancel.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested-cancel.f90
+++ flang/test/Semantics/OpenMP/omp-nested-cancel.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 5.0
 ! Check OpenMP construct validity for the following directives:
Index: flang/test/Semantics/OpenMP/omp-nested-cancellation-point.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested-cancellation-point.f90
+++ flang/test/Semantics/OpenMP/omp-nested-cancellation-point.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 5.0
 ! Check OpenMP construct validity for the following directives:
Index: flang/test/Semantics/OpenMP/omp-nested-distribute.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested-distribute.f90
+++ flang/test/Semantics/OpenMP/omp-nested-distribute.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! Check OpenMP clause validity for the following directives:
 !     2.10 Device constructs
 program main
Index: flang/test/Semantics/OpenMP/omp-nested-master.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested-master.f90
+++ flang/test/Semantics/OpenMP/omp-nested-master.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! Various checks with the nesting of MASTER construct
 
Index: flang/test/Semantics/OpenMP/omp-nested-simd.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested-simd.f90
+++ flang/test/Semantics/OpenMP/omp-nested-simd.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! Various checks with the nesting of SIMD construct
 
Index: flang/test/Semantics/OpenMP/omp-nested-target.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested-target.f90
+++ flang/test/Semantics/OpenMP/omp-nested-target.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 
 ! OpenMP Version 5.0
 ! Check OpenMP construct validity for the following directives:
Index: flang/test/Semantics/OpenMP/omp-nested-teams.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested-teams.f90
+++ flang/test/Semantics/OpenMP/omp-nested-teams.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 5.0
 ! Check OpenMP construct validity for the following directives:
Index: flang/test/Semantics/OpenMP/omp-nested01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nested01.f90
+++ flang/test/Semantics/OpenMP/omp-nested01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! Check OpenMP 2.17 Nesting of Regions
 
Index: flang/test/Semantics/OpenMP/omp-no-dowhile-in-parallel.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-no-dowhile-in-parallel.f90
+++ flang/test/Semantics/OpenMP/omp-no-dowhile-in-parallel.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 subroutine bug48308(x,i)
   real :: x(:)
Index: flang/test/Semantics/OpenMP/omp-nontemporal.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-nontemporal.f90
+++ flang/test/Semantics/OpenMP/omp-nontemporal.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s  %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s  %flang -fopenmp
 ! REQUIRES: shell
 ! Check OpenMP clause validity for NONTEMPORAL clause
 
Index: flang/test/Semantics/OpenMP/omp-ordered-simd.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-ordered-simd.f90
+++ flang/test/Semantics/OpenMP/omp-ordered-simd.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! Various checks with the ordered construct
 
Index: flang/test/Semantics/OpenMP/omp-ordered01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-ordered01.f90
+++ flang/test/Semantics/OpenMP/omp-ordered01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.19.9 Ordered Construct
Index: flang/test/Semantics/OpenMP/omp-ordered02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-ordered02.f90
+++ flang/test/Semantics/OpenMP/omp-ordered02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.19.9 Ordered Construct
Index: flang/test/Semantics/OpenMP/omp-ordered03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-ordered03.f90
+++ flang/test/Semantics/OpenMP/omp-ordered03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.19.9 Ordered Construct
Index: flang/test/Semantics/OpenMP/omp-parallel-private01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-private01.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-private01.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.3 parallel private Clause
 program omp_parallel_private
Index: flang/test/Semantics/OpenMP/omp-parallel-private02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-private02.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-private02.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.3 parallel private Clause
 program omp_parallel_private
Index: flang/test/Semantics/OpenMP/omp-parallel-private03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-private03.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-private03.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.3 parallel private Clause
 program omp_parallel_private
Index: flang/test/Semantics/OpenMP/omp-parallel-private04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-private04.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-private04.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.3 parallel private Clause
 program omp_parallel_private
Index: flang/test/Semantics/OpenMP/omp-parallel-sections01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-sections01.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-sections01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP version 5.0.0
 ! 2.13.3 parallel sections Construct
 ! The restrictions for the parallel construct and the sections construct apply
Index: flang/test/Semantics/OpenMP/omp-parallel-shared01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-shared01.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-shared01.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.2 parallel shared Clause
 program omp_parallel_shared
Index: flang/test/Semantics/OpenMP/omp-parallel-shared02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-shared02.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-shared02.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.2 parallel shared Clause
 program omp_parallel_shared
Index: flang/test/Semantics/OpenMP/omp-parallel-shared03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-shared03.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-shared03.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.2 parallel shared Clause
 program omp_parallel_shared
Index: flang/test/Semantics/OpenMP/omp-parallel-shared04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-parallel-shared04.f90
+++ flang/test/Semantics/OpenMP/omp-parallel-shared04.f90
@@ -1,4 +1,4 @@
-!RUN: %python %S/test_errors.py %s %flang -fopenmp
+!RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.2 parallel shared Clause
 program omp_parallel_shared
Index: flang/test/Semantics/OpenMP/omp-private01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-private01.f90
+++ flang/test/Semantics/OpenMP/omp-private01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.3 private Clause
 ! Pointers with the INTENT(IN) attribute may not appear in a private clause.
Index: flang/test/Semantics/OpenMP/omp-private02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-private02.f90
+++ flang/test/Semantics/OpenMP/omp-private02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.3 private Clause
 ! Variables that appear in namelist statements may not appear in a private clause.
Index: flang/test/Semantics/OpenMP/omp-reduction01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction01.f90
+++ flang/test/Semantics/OpenMP/omp-reduction01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause
 program omp_reduction
Index: flang/test/Semantics/OpenMP/omp-reduction02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction02.f90
+++ flang/test/Semantics/OpenMP/omp-reduction02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause
 program omp_reduction
Index: flang/test/Semantics/OpenMP/omp-reduction03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction03.f90
+++ flang/test/Semantics/OpenMP/omp-reduction03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause
 
Index: flang/test/Semantics/OpenMP/omp-reduction04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction04.f90
+++ flang/test/Semantics/OpenMP/omp-reduction04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause
 program omp_Reduction
Index: flang/test/Semantics/OpenMP/omp-reduction05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction05.f90
+++ flang/test/Semantics/OpenMP/omp-reduction05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause
 
Index: flang/test/Semantics/OpenMP/omp-reduction06.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction06.f90
+++ flang/test/Semantics/OpenMP/omp-reduction06.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause
 
Index: flang/test/Semantics/OpenMP/omp-reduction07.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction07.f90
+++ flang/test/Semantics/OpenMP/omp-reduction07.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause
 program omp_reduction
Index: flang/test/Semantics/OpenMP/omp-reduction08.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction08.f90
+++ flang/test/Semantics/OpenMP/omp-reduction08.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause Positive cases
 
Index: flang/test/Semantics/OpenMP/omp-reduction09.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction09.f90
+++ flang/test/Semantics/OpenMP/omp-reduction09.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause Positive cases.
 !DEF: /omp_reduction MainProgram
Index: flang/test/Semantics/OpenMP/omp-reduction10.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-reduction10.f90
+++ flang/test/Semantics/OpenMP/omp-reduction10.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.15.3.6 Reduction Clause
 program omp_reduction
Index: flang/test/Semantics/OpenMP/omp-resolve01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-resolve01.f90
+++ flang/test/Semantics/OpenMP/omp-resolve01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! 2.4 An array section designates a subset of the elements in an array. Although
 ! Substring shares similar syntax but cannot be treated as valid array section.
Index: flang/test/Semantics/OpenMP/omp-resolve02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-resolve02.f90
+++ flang/test/Semantics/OpenMP/omp-resolve02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! Test the effect to name resolution from illegal clause
 
Index: flang/test/Semantics/OpenMP/omp-resolve03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-resolve03.f90
+++ flang/test/Semantics/OpenMP/omp-resolve03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! 2.15.3 Although variables in common blocks can be accessed by use association
 ! or host association, common block names cannot. As a result, a common block
Index: flang/test/Semantics/OpenMP/omp-resolve04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-resolve04.f90
+++ flang/test/Semantics/OpenMP/omp-resolve04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! 2.15.3 Data-Sharing Attribute Clauses
 ! A list item that specifies a given variable may not appear in more than
Index: flang/test/Semantics/OpenMP/omp-resolve05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-resolve05.f90
+++ flang/test/Semantics/OpenMP/omp-resolve05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! 2.15.3 Data-Sharing Attribute Clauses
 ! 2.15.3.1 default Clause
Index: flang/test/Semantics/OpenMP/omp-resolve06.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-resolve06.f90
+++ flang/test/Semantics/OpenMP/omp-resolve06.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 use omp_lib
 !2.11.4 Allocate Clause
 !For any list item that is specified in the allocate
Index: flang/test/Semantics/OpenMP/omp-sections01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-sections01.f90
+++ flang/test/Semantics/OpenMP/omp-sections01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 4.5
 ! 2.7.2 sections Construct
Index: flang/test/Semantics/OpenMP/omp-sections02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-sections02.f90
+++ flang/test/Semantics/OpenMP/omp-sections02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP version 5.0.0
 ! 2.8.1 sections construct
 ! The code enclosed in a sections construct must be a structured block.
Index: flang/test/Semantics/OpenMP/omp-sections03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-sections03.f90
+++ flang/test/Semantics/OpenMP/omp-sections03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 !XFAIL: *
 ! OpenMP version 5.0.0
 ! 2.8.1 sections construct
Index: flang/test/Semantics/OpenMP/omp-simd-aligned.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-simd-aligned.f90
+++ flang/test/Semantics/OpenMP/omp-simd-aligned.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 4.5
 ! 2.8.1 simd Construct
Index: flang/test/Semantics/OpenMP/omp-simd-nontemporal.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-simd-nontemporal.f90
+++ flang/test/Semantics/OpenMP/omp-simd-nontemporal.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 4.5
 ! 2.8.1 simd Construct
Index: flang/test/Semantics/OpenMP/omp-simd01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-simd01.f90
+++ flang/test/Semantics/OpenMP/omp-simd01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 5.0
 ! 2.9.3.1 simd Construct
 !   - A program that branches into or out of a simd region is non-conforming.
Index: flang/test/Semantics/OpenMP/omp-simd02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-simd02.f90
+++ flang/test/Semantics/OpenMP/omp-simd02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 4.5
 ! 2.8.1 simd Construct
Index: flang/test/Semantics/OpenMP/omp-single01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-single01.f90
+++ flang/test/Semantics/OpenMP/omp-single01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.3 single Construct
 ! Symbol present on multiple clauses
Index: flang/test/Semantics/OpenMP/omp-single02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-single02.f90
+++ flang/test/Semantics/OpenMP/omp-single02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.3 single Construct
 ! Copyprivate variable is not thread private or private in outer context
Index: flang/test/Semantics/OpenMP/omp-symbol01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-symbol01.f90
+++ flang/test/Semantics/OpenMP/omp-symbol01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! Test clauses that accept list.
 ! 2.1 Directive Format
Index: flang/test/Semantics/OpenMP/omp-symbol02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-symbol02.f90
+++ flang/test/Semantics/OpenMP/omp-symbol02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 1.4.1 Structure of the OpenMP Memory Model
 
Index: flang/test/Semantics/OpenMP/omp-symbol03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-symbol03.f90
+++ flang/test/Semantics/OpenMP/omp-symbol03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 1.4.1 Structure of the OpenMP Memory Model
 ! In the inner OpenMP region, SHARED `a` refers to the `a` in the outer OpenMP
Index: flang/test/Semantics/OpenMP/omp-symbol04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-symbol04.f90
+++ flang/test/Semantics/OpenMP/omp-symbol04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 2.15.3 Data-Sharing Attribute Clauses
 ! Both PARALLEL and DO (worksharing) directives need to create new scope,
Index: flang/test/Semantics/OpenMP/omp-symbol05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-symbol05.f90
+++ flang/test/Semantics/OpenMP/omp-symbol05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 2.15.2 threadprivate Directive
 ! The threadprivate directive specifies that variables are replicated,
Index: flang/test/Semantics/OpenMP/omp-symbol06.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-symbol06.f90
+++ flang/test/Semantics/OpenMP/omp-symbol06.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 2.15.3 Data-Sharing Attribute Clauses
 ! A list item that specifies a given variable may not appear in more than
Index: flang/test/Semantics/OpenMP/omp-symbol07.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-symbol07.f90
+++ flang/test/Semantics/OpenMP/omp-symbol07.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! Generic tests
 !   1. subroutine or function calls should not be fixed for DSA or DMA
Index: flang/test/Semantics/OpenMP/omp-symbol08.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-symbol08.f90
+++ flang/test/Semantics/OpenMP/omp-symbol08.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenmp
 
 ! 2.15.1.1 Predetermined rules for associated do-loops index variable
 !   a) The loop iteration variable(s) in the associated do-loop(s) of a do,
Index: flang/test/Semantics/OpenMP/omp-sync-critical01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-sync-critical01.f90
+++ flang/test/Semantics/OpenMP/omp-sync-critical01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 5.0
 ! 2.17.1 critical construct
Index: flang/test/Semantics/OpenMP/omp-sync-critical02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-sync-critical02.f90
+++ flang/test/Semantics/OpenMP/omp-sync-critical02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 5.0
 ! 2.17.1 critical construct
Index: flang/test/Semantics/OpenMP/omp-taskgroup01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-taskgroup01.f90
+++ flang/test/Semantics/OpenMP/omp-taskgroup01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 use omp_lib
   implicit none
Index: flang/test/Semantics/OpenMP/omp-taskloop-simd01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-taskloop-simd01.f90
+++ flang/test/Semantics/OpenMP/omp-taskloop-simd01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 
 ! OpenMP Version 5.0
 ! 2.10.3 taskloop simd Construct
Index: flang/test/Semantics/OpenMP/omp-taskloop01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-taskloop01.f90
+++ flang/test/Semantics/OpenMP/omp-taskloop01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.9.2 taskloop Construct
 
Index: flang/test/Semantics/OpenMP/omp-threadprivate01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-threadprivate01.f90
+++ flang/test/Semantics/OpenMP/omp-threadprivate01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.21.2 Threadprivate Directive
Index: flang/test/Semantics/OpenMP/omp-threadprivate02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-threadprivate02.f90
+++ flang/test/Semantics/OpenMP/omp-threadprivate02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.21.2 Threadprivate Directive
Index: flang/test/Semantics/OpenMP/omp-threadprivate03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-threadprivate03.f90
+++ flang/test/Semantics/OpenMP/omp-threadprivate03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.21.2 Threadprivate Directive
Index: flang/test/Semantics/OpenMP/omp-threadprivate04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-threadprivate04.f90
+++ flang/test/Semantics/OpenMP/omp-threadprivate04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.21.2 Threadprivate Directive
Index: flang/test/Semantics/OpenMP/omp-threadprivate05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-threadprivate05.f90
+++ flang/test/Semantics/OpenMP/omp-threadprivate05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1 -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang_fc1 -fopenmp
 ! OpenMP Version 5.1
 ! Check OpenMP construct validity for the following directives:
 ! 2.21.2 Threadprivate Directive
Index: flang/test/Semantics/OpenMP/omp-workshare01.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-workshare01.f90
+++ flang/test/Semantics/OpenMP/omp-workshare01.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.4 workshare Construct
 ! Invalid do construct inside !$omp workshare
Index: flang/test/Semantics/OpenMP/omp-workshare02.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-workshare02.f90
+++ flang/test/Semantics/OpenMP/omp-workshare02.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.4 workshare Construct
 ! The !omp workshare construct must not contain any user defined
Index: flang/test/Semantics/OpenMP/omp-workshare03.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-workshare03.f90
+++ flang/test/Semantics/OpenMP/omp-workshare03.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.4 workshare Construct
 ! All array assignments, scalar assignments, and masked array assignments
Index: flang/test/Semantics/OpenMP/omp-workshare04.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-workshare04.f90
+++ flang/test/Semantics/OpenMP/omp-workshare04.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.4 workshare Construct
 ! Checks for OpenMP Workshare construct
Index: flang/test/Semantics/OpenMP/omp-workshare05.f90
===================================================================
--- flang/test/Semantics/OpenMP/omp-workshare05.f90
+++ flang/test/Semantics/OpenMP/omp-workshare05.f90
@@ -1,4 +1,4 @@
-! RUN: %python %S/test_errors.py %s %flang -fopenmp
+! RUN: %python %S/../test_errors.py %s %flang -fopenmp
 ! OpenMP Version 4.5
 ! 2.7.4 workshare Construct
 ! Checks for OpenMP Parallel constructs enclosed in Workshare constructs
Index: flang/test/Semantics/canondo05.f90
===================================================================
--- flang/test/Semantics/canondo05.f90
+++ flang/test/Semantics/canondo05.f90
@@ -1,40 +1,28 @@
-! RUN: %flang_fc1 -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
-! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
-! CHECK-NOT: do *[1-9]
+! 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.
 
-program P
-implicit none
-integer OMP_GET_NUM_THREADS, OMP_GET_THREAD_NUM
-integer NUMTHRDS, TID
-integer N, CSZ, CNUM, I
-parameter (N=100)
-parameter (CSZ=10) 
-real A(N), B(N), C(N)
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>&1 | FileCheck %s
 
-do 10 I = 1, N
-   A(I) = I * 1.0
-10 continue
+! CHECK: end do
+! CHECK: 2 do
+! CHECK: mainloop: do
+! CHECK: end do mainloop
 
-B = A
-CNUM = CSZ
+! CHECK-NOT: do [1-9]
 
-!$OMP PARALLEL SHARED(A,B,C,NUMTHRDS,CNUM) PRIVATE(I,TID)
-TID = OMP_GET_THREAD_NUM()
-if (TID .EQ. 0) then
-   NUMTHRDS = OMP_GET_NUM_THREADS()
-   print *, "Number of threads =", NUMTHRDS
-end if
-print *, "Thread", TID, " is starting..."
+subroutine foo()
+  do 1 i=1,2
+    goto 2
+1 continue
+2 do 3 i=1,2
+3 continue
 
-!$OMP DO SCHEDULE(DYNAMIC,CNUM)
-do 20 I = 1, N
-   C(I) = A(I) + B(I)
-   write (*,100) TID, I, C(I)
-20 continue
-!$OMP END DO NOWAIT
-
-print *, "Thread", TID, " done."
-
-!$OMP END PARALLEL
-100 format(" Thread", I2, ": C(", I3, ")=", F8.2)
-end program P
+  mainloop : do 4 i=1,100
+    do j=1,20
+      if (j==i) then
+        ! cycle mainloop: TODO: fix invalid complaints that mainloop construct
+        ! is not in scope.
+      end if
+    end do
+4 end do mainloop
+end subroutine
Index: flang/test/Semantics/canondo06.f90
===================================================================
--- flang/test/Semantics/canondo06.f90
+++ flang/test/Semantics/canondo06.f90
@@ -1,25 +1,28 @@
-! RUN: %flang_fc1 -fopenmp -fdebug-unparse-with-symbols %s 2>&1 | FileCheck %s
-! CHECK-NOT: do *[1-9]
-! CHECK: omp simd
+! Error test -- DO loop uses obsolete loop termination statement (warning)
+! See R1131 and C1133
 
-program P
-implicit none
-integer N, I
-parameter (N=100)
-real A(N), B(N), C(N)
+! By default, this is not an error and label do are rewritten to non-label do.
+! A warning is generated with -pedantic
 
-!$OMP SIMD
-do 10 I = 1, N
-   A(I) = I * 1.0
-10 continue
+! RUN: %flang_fc1 -fdebug-unparse-with-symbols -pedantic %s 2>%t.stderr | FileCheck %s
 
-B = A
+! CHECK: end do
 
-!$OMP SIMD
-do 20 I = 1, N
-   C(I) = A(I) + B(I)
-   write (*,100) I, C(I)
-20 continue
+! 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]
 
-100 format(" C(", I3, ")=", F8.2)
-end program P
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
+
+subroutine foo10()
+  real :: a(10, 10), b(10, 10) = 1.0
+  do 01 k=1,4
+    where (a<k)
+      a = a + b
+      b = a - b
+    elsewhere
+      a = a*2
+01  end where
+end subroutine
Index: flang/test/Semantics/canondo18.f90
===================================================================
--- flang/test/Semantics/canondo18.f90
+++ /dev/null
@@ -1,28 +0,0 @@
-! 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 -pedantic
-
-! 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 foo10()
-  real :: a(10, 10), b(10, 10) = 1.0
-  do 01 k=1,4
-    where (a<k)
-      a = a + b
-      b = a - b
-    elsewhere
-      a = a*2
-01  end where
-end subroutine
Index: flang/test/Semantics/canondo19.f90
===================================================================
--- flang/test/Semantics/canondo19.f90
+++ /dev/null
@@ -1,28 +0,0 @@
-! 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: %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]
-
-subroutine foo()
-  do 1 i=1,2
-    goto 2
-1 continue
-2 do 3 i=1,2
-3 continue
-
-  mainloop : do 4 i=1,100
-    do j=1,20
-      if (j==i) then
-        ! cycle mainloop: TODO: fix invalid complaints that mainloop construct
-        ! is not in scope.
-      end if
-    end do
-4 end do mainloop
-end subroutine
Index: flang/test/Semantics/modfile47.f90
===================================================================
--- flang/test/Semantics/modfile47.f90
+++ flang/test/Semantics/modfile47.f90
@@ -1,35 +1,19 @@
-! RUN: %python %S/test_modfile.py %s %flang_fc1 -fopenmp
-! Check correct modfile generation for OpenMP threadprivate directive.
-
-module m
-  implicit none
-  type :: my_type(kind_param, len_param)
-    integer, KIND :: kind_param
-    integer, LEN :: len_param
-    integer :: t_i
-    integer :: t_arr(10)
-  end type
-  type(my_type(kind_param=2, len_param=4)) :: t
-  real, dimension(3) :: thrtest
-  real :: x
-  common /blk/ x
-
-  !$omp threadprivate(thrtest, t, /blk/)
+! RUN: %python %S/test_errors.py %s %flang_fc1
+subroutine foo
+end
+subroutine iso_fortran_env
+end
+subroutine bad1
+  !ERROR: 'foo' is not a module
+  use foo
+end
+subroutine ok1
+  use, intrinsic :: iso_fortran_env
+end
+subroutine ok2
+  use iso_fortran_env
+end
+subroutine bad2
+  !ERROR: 'iso_fortran_env' is not a module
+  use, non_intrinsic :: iso_fortran_env
 end
-
-!Expect: m.mod
-!module m
-!type::my_type(kind_param,len_param)
-!integer(4),kind::kind_param
-!integer(4),len::len_param
-!integer(4)::t_i
-!integer(4)::t_arr(1_8:10_8)
-!end type
-!type(my_type(kind_param=2_4,len_param=4_4))::t
-!!$omp threadprivate(t)
-!real(4)::thrtest(1_8:3_8)
-!!$omp threadprivate(thrtest)
-!real(4)::x
-!!$omp threadprivate(x)
-!common/blk/x
-!end
Index: flang/test/Semantics/modfile49.f90
===================================================================
--- flang/test/Semantics/modfile49.f90
+++ /dev/null
@@ -1,19 +0,0 @@
-! RUN: %python %S/test_errors.py %s %flang_fc1
-subroutine foo
-end
-subroutine iso_fortran_env
-end
-subroutine bad1
-  !ERROR: 'foo' is not a module
-  use foo
-end
-subroutine ok1
-  use, intrinsic :: iso_fortran_env
-end
-subroutine ok2
-  use iso_fortran_env
-end
-subroutine bad2
-  !ERROR: 'iso_fortran_env' is not a module
-  use, non_intrinsic :: iso_fortran_env
-end