[Openmp-commits] [openmp] be59fe5 - [OpenMP][Flang]Fix some of the Fortan OpenMP Offloading tests

[Akash Banerjee via Openmp-commits]

Author: Akash Banerjee
Date: 2023-11-06T13:24:02Z
New Revision: be59fe5028b99c36c4bc9ccf6304216e50b337a8

URL: https://github.com/llvm/llvm-project/commit/be59fe5028b99c36c4bc9ccf6304216e50b337a8
DIFF: https://github.com/llvm/llvm-project/commit/be59fe5028b99c36c4bc9ccf6304216e50b337a8.diff

LOG: [OpenMP][Flang]Fix some of the Fortan OpenMP Offloading tests

target_map_common_block2.f90
	- Fix the extra space in the print message.
	- #67164 fixes this. So moving it outside of failing and also removing XFAIL marker.

basic-target-region-3D-array.f90
	- Corrected the check to account for the new lines printed.

Depends on #67319

Added: 
    openmp/libomptarget/test/offloading/fortran/target_map_common_block2.f90

Modified: 
    openmp/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90

Removed: 
    openmp/libomptarget/test/offloading/fortran/failing/target_map_common_block2.f90


################################################################################
diff  --git a/openmp/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90 b/openmp/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
index 44ff394dcda16be..abc2763d4a30cca 100644
--- a/openmp/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
+++ b/openmp/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
@@ -23,7 +23,7 @@ program main
     end do
 
 i = 1
-j = 1 
+j = 1
 k = 1
 
 !$omp target map(tofrom:x, counter) map(to: i, j, k, i2, j2, k2)
@@ -50,5 +50,12 @@ program main
         end do
     end do
 end program main
-  
-! CHECK: 1 2 3 4 5 6 7 8
+
+! CHECK: 1
+! CHECK: 2
+! CHECK: 3
+! CHECK: 4
+! CHECK: 5
+! CHECK: 6
+! CHECK: 7
+! CHECK: 8

diff  --git a/openmp/libomptarget/test/offloading/fortran/failing/target_map_common_block2.f90 b/openmp/libomptarget/test/offloading/fortran/target_map_common_block2.f90
similarity index 85%
rename from openmp/libomptarget/test/offloading/fortran/failing/target_map_common_block2.f90
rename to openmp/libomptarget/test/offloading/fortran/target_map_common_block2.f90
index 1f95ef7c460757d..8a9c47545fbd789 100644
--- a/openmp/libomptarget/test/offloading/fortran/failing/target_map_common_block2.f90
+++ b/openmp/libomptarget/test/offloading/fortran/target_map_common_block2.f90
@@ -7,7 +7,6 @@
 ! UNSUPPORTED: x86_64-pc-linux-gnu-LTO
 
 ! RUN: %libomptarget-compile-fortran-run-and-check-generic
-! XFAIL: *
 
 program main
   use omp_lib
@@ -15,11 +14,11 @@ program main
   common var4
   var4 = 24
   tmp = 12
-  print *, "var4 before target = ", var4
+  print *, "var4 before target =", var4
   !$omp target map(tofrom:var4)
     var4 = tmp
   !$omp end target
-  print *, "var4 after target = ", var4
+  print *, "var4 after target =", var4
 end program
 
 ! CHECK: var4 before target = 24