From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id BBC5A3858CDB for ; Mon, 5 Feb 2024 13:04:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BBC5A3858CDB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cebitec.uni-bielefeld.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BBC5A3858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=129.70.160.84 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707138279; cv=none; b=V7PcALnibAbqsav8yxNqXc5ZLPB+ONONoQibjIljAtk4zlbf3B+6hF4lYSJQQeh38NO2F7MUOBzdGpRuJBegcYMAkOgM/KcJvoWOuuaDeqZEI81qNdHtvKySkf5/km82MQTRJ8P6ebtwLZDye8Wll8vbHJQdzLVbZhzADlfC8yw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707138279; c=relaxed/simple; bh=Y+6RazQpD90JR2jzuLsvQkxWX3RcyD8FbOtuleFmCHQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Qf1kVOQxUaJ2vgdQQxTzrpaHFfr5RVcxMD5u0wB3B/kRdaybP5rySJ3e6M1R8B1MjiRRlNN1uP7Sc6CpVAAuxB5yJkj1DDFivojAGcK37PbEDSigaXGYJMwuTJf3w97iw5bIkfAZhZVjmXPggAZtiWJLvE+V/YuCA4n0uJCiqJs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id BFDD4ADBA1; Mon, 5 Feb 2024 14:04:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= cebitec.uni-bielefeld.de; h=content-type:content-type :mime-version:user-agent:message-id:date:date:subject:subject :from:from:received:received; s=20200306; t=1707138276; bh=Y+6Ra zQpD90JR2jzuLsvQkxWX3RcyD8FbOtuleFmCHQ=; b=OYnZxgOlNHkxKdH5cohcK a3upkooPzBZ74Ub2e+NaXQBxI87C7oxhoSkOqF/lvnBl6n2LuBer43+zIklWE8Uw FyeYvd8OtjBRn/nIAb1aXnFyDLZv0VabKGdhDJXdC0SS/XwcJkvkJgdZr0TKmuiA JJm+g3V0v9GKFyvyklwXVJTG3arq6v0h2nOsd8fS7moBLDRYeAYeNsBeJN6//bfc iprqdDKH1Qz4fslaN+I8J+ORQh4tEs9RAUQA1zPDYYoQ+OYWEHcmfF1BYEbwkrqn QwMqyhu+8Nsb2Zo7GshrJ836bz4j7ibbfQc8HPHymS94H6Bwf8Xf76o0TrjQICGP Q== X-Virus-Scanned: amavisd-new at cebitec.uni-bielefeld.de Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id EdNohvmev6o2; Mon, 5 Feb 2024 14:04:36 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p5085539e.dip0.t-ipconnect.de [80.133.83.158]) (Authenticated sender: ro) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 38DEDAD575; Mon, 5 Feb 2024 14:04:36 +0100 (CET) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Jakub Jelinek , Andrew Stubbs Subject: [PATCH] libgomp: testsuite: Don't XPASS libgomp.c/alloc-pinned-1.c etc. on non-Linux targets [PR113448] Date: Mon, 05 Feb 2024 14:04:35 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.90 (usg-unix-v) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Status: No, score=-3791.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --=-=-= Content-Type: text/plain Two libgomp tests XPASS on Solaris (any non-Linux target actually) since their introduction: XPASS: libgomp.c/alloc-pinned-1.c execution test XPASS: libgomp.c/alloc-pinned-2.c execution test The problem is that the test just prints OS unsupported and exits successfully, while the test is XFAILed: /* { dg-xfail-run-if "Pinning not implemented on this host" { ! *-*-linux-gnu } } */ Fixed by aborting immediately after the message above in the non-Linux case. Tested on i386-pc-solaris2.11 and i686-pc-linux-gnu. Ok for trunk? Rainer -- ----------------------------------------------------------------------------- Rainer Orth, Center for Biotechnology, Bielefeld University 2024-02-02 Rainer Orth libgomp: PR testsuite/113448 * testsuite/libgomp.c/alloc-pinned-1.c [!__linux__] (CHECK_SIZE): Call abort. * testsuite/libgomp.c/alloc-pinned-2.c [!__linux__] (CHECK_SIZE): Likewise. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=libgomp-testsuite-alloc-pinned-non-linux.patch # HG changeset patch # Parent b7015efde7d6a48dd520698b470fcaf824758f21 libgomp: testsuite: Fix libgomp.c/alloc-pinned-1.c etc. on non-Linux targets [PR113085] diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c --- a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c +++ b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c @@ -45,7 +45,10 @@ get_pinned_mem () } #else #define PAGE_SIZE 1024 /* unknown */ -#define CHECK_SIZE(SIZE) fprintf (stderr, "OS unsupported\n"); +#define CHECK_SIZE(SIZE) { \ + fprintf (stderr, "OS unsupported\n"); \ + abort (); \ + } #define EXPECT_OMP_NULL_ALLOCATOR int diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c b/libgomp/testsuite/libgomp.c/alloc-pinned-2.c --- a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c +++ b/libgomp/testsuite/libgomp.c/alloc-pinned-2.c @@ -45,12 +45,16 @@ get_pinned_mem () } #else #define PAGE_SIZE 1024 /* unknown */ -#define CHECK_SIZE(SIZE) fprintf (stderr, "OS unsupported\n"); +#define CHECK_SIZE(SIZE) { \ + fprintf (stderr, "OS unsupported\n"); \ + abort (); \ + } #define EXPECT_OMP_NULL_ALLOCATOR int get_pinned_mem () { + abort (); return 0; } #endif --=-=-=--