From 2fe98b9b6c6ea39e3073f615b0d60af9f14dc1e0 Mon Sep 17 00:00:00 2001
From: agozillon <Andrew.Gozillon@amd.com>
Date: Thu, 13 Jun 2024 14:13:26 -0500
Subject: [PATCH] Adjust tests based on rebase and a silly mistake when porting
 test into offload folder

---
 flang/test/Lower/OpenMP/common-block-map.f90  |  4 +--
 ...t-map-declare-target-link-common-block.f90 | 25 +------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/flang/test/Lower/OpenMP/common-block-map.f90 b/flang/test/Lower/OpenMP/common-block-map.f90
index 56a5e775b1b65c..5033129683a8eb 100644
--- a/flang/test/Lower/OpenMP/common-block-map.f90
+++ b/flang/test/Lower/OpenMP/common-block-map.f90
@@ -1,7 +1,7 @@
 !RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - | FileCheck %s
 
-!CHECK: fir.global common @var_common_(dense<0> : vector<8xi8>) : !fir.array<8xi8>
-!CHECK: fir.global common @var_common_link_(dense<0> : vector<8xi8>) {omp.declare_target = #omp.declaretarget<device_type = (any), capture_clause = (link)>} : !fir.array<8xi8>
+!CHECK: fir.global common @var_common_(dense<0> : vector<8xi8>) {{.*}} : !fir.array<8xi8>
+!CHECK: fir.global common @var_common_link_(dense<0> : vector<8xi8>) {{{.*}} omp.declare_target = #omp.declaretarget<device_type = (any), capture_clause = (link)>} : !fir.array<8xi8>
 
 !CHECK-LABEL: func.func @_QPmap_full_block
 !CHECK: %[[CB_ADDR:.*]] = fir.address_of(@var_common_) : !fir.ref<!fir.array<8xi8>>
diff --git a/offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90 b/offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90
index 758f7e89702468..47f50840befd3e 100644
--- a/offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90
+++ b/offload/test/offloading/fortran/target-map-declare-target-link-common-block.f90
@@ -24,29 +24,11 @@ program main
   !$omp end target
 
   call modify_2
+  call modify_3
 
   print *, var1
   print *, var2
   print *, var3
-
-  call modify_3
-
-  if (var1 /= 20) then
-      print*, "======= FORTRAN Test Failed! ======="
-      stop 1
-  end if
-
-  if (var2 /= 100) then
-    print*, "======= FORTRAN Test Failed! ======="
-    stop 1
-  end if
-
-  if (var3 /= 60) then
-    print*, "======= FORTRAN Test Failed! ======="
-    stop 1
-  end if
-
-  print*, "======= FORTRAN Test Passed! ======="
 end program
 
 subroutine modify_1
@@ -71,11 +53,6 @@ subroutine modify_2
 !$omp end target
 
   print *, copy
-
-  if (copy /= 80) then
-    print*, "======= FORTRAN Test Failed! ======="
-    stop 1
-  end if
 end
 
 subroutine modify_3