From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id A7D5A3858D38; Mon, 19 Jun 2023 15:18:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7D5A3858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687187928; bh=RKFaTMFlJnxDQzXo+9YBx/Ie/yxzMOESrQ8yi+RW8/0=; h=From:To:Subject:Date:From; b=tkTCjG6GiQm4dFanZ2X6FJEeRsBrLgSji4AOoZ2kyREyEGigzDa86ZdpgGGF23b7f lhST+lwompxTT38MDf6c+iTEdqymZIr8rPIZJtIZAcu1EfKxz6EWyeYnLBOG8a+OWG xeIgf2XYyPcdxcdW5GOYMO5fhTUIeuskdY2bIGq4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-13] libgomp.c/target-51.c: Accept more error-msg variants in dg-output X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-13 X-Git-Oldrev: fab6ab642205f7226e98a5ee4a3b46bc85e50360 X-Git-Newrev: 180b5fe60a8c70d4f4aac1be9e2b34f6ac5cfa4b Message-Id: <20230619151848.A7D5A3858D38@sourceware.org> Date: Mon, 19 Jun 2023 15:18:48 +0000 (GMT) List-Id: https://gcc.gnu.org/g:180b5fe60a8c70d4f4aac1be9e2b34f6ac5cfa4b commit 180b5fe60a8c70d4f4aac1be9e2b34f6ac5cfa4b Author: Tobias Burnus Date: Mon Jun 19 11:21:04 2023 +0200 libgomp.c/target-51.c: Accept more error-msg variants in dg-output Depending on the details, the testcase can fail with different but related messages; all of the following all could be observed for this testcase: libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device cannot be used for offloading libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device not found libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but only the host device is available Before, the last two were tested for with 'target offload_device' and '! offload_device', respectively. Now, all three are accepted by matching '.*' already after 'but' and without distinguishing whether the effective target is an offload_device or not. (For completeness, there is a fourth error that follows this pattern: 'OMP_TARGET_OFFLOAD is set to MANDATORY, but device is finalized'.) libgomp/ * testsuite/libgomp.c/target-51.c: Accept more error msg variants as expected dg-output. (cherry picked from commit 01fe115ba7eafebcf97bbac9e157038a003d0c85) Diff: --- libgomp/ChangeLog.omp | 8 ++++++++ libgomp/testsuite/libgomp.c/target-51.c | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 74e0bfe5079..f9f821bd172 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,11 @@ +2023-06-19 Tobias Burnus + + Backported from mainline: + 2023-06-19 Tobias Burnus + + * testsuite/libgomp.c/target-51.c: Accept more error msg variants + as expected dg-output. + 2023-06-19 Tobias Burnus Backported from mainline: diff --git a/libgomp/testsuite/libgomp.c/target-51.c b/libgomp/testsuite/libgomp.c/target-51.c index bbe9ade6e24..db0363bfc14 100644 --- a/libgomp/testsuite/libgomp.c/target-51.c +++ b/libgomp/testsuite/libgomp.c/target-51.c @@ -9,8 +9,7 @@ /* See comment in target-50.c/target-50.c for why the output differs. */ -/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but only the host device is available.*" { target { ! offload_device } } } */ -/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device not found.*" { target offload_device } } */ +/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but .*" } } */ int main ()