commit a9d17fbd1e918019b77a6d9616704db85b5c3e8c Author: Tobias Burnus Date: Wed Jul 19 14:52:00 2023 +0200 libgomp.fortran/map-subarray-5.f90: Fix for shared-mem device/host libgomp/ * testsuite/libgomp.fortran/map-subarray-5.f90: Only expect libgomp dg-output for offload_device_nonshared_as. --- libgomp/ChangeLog.omp | 5 +++++ libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 7cc64943446..cbc12c0fab0 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,8 @@ +2023-07-19 Tobias Burnus + + * testsuite/libgomp.fortran/map-subarray-5.f90: Only expect + libgomp dg-output for offload_device_nonshared_as. + 2023-07-19 Tobias Burnus Backported from master: diff --git a/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 index e7cdf11e610..59ad01ab76b 100644 --- a/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 +++ b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 @@ -49,6 +49,6 @@ end do end -! { dg-output "(\n|\r|\r\n)" } -! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r|\r\n)+" } +! { dg-output "(\n|\r|\r\n)" { target offload_device_nonshared_as } } +! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r|\r\n)+" { target offload_device_nonshared_as } } ! { dg-shouldfail "" { offload_device_nonshared_as } }