From patchwork Thu Jan 12 03:00:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63069 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B6996388214C for ; Thu, 12 Jan 2023 03:08:21 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy2-pub.mail.unifiedlayer.com (gproxy2-pub.mail.unifiedlayer.com [69.89.18.3]) by sourceware.org (Postfix) with ESMTPS id 36928388211C for ; Thu, 12 Jan 2023 03:01:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 36928388211C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id AC08E1004825D for ; Thu, 12 Jan 2023 03:01:49 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id FnqfplM3hLXXpFnqfp4kcG; Thu, 12 Jan 2023 03:01:49 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=KvyIZUaN c=1 sm=1 tr=0 ts=63bf781d a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=UXX8t40Uk3X1Mqv4czYA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=HlwZ/wl7LHawlgVTpvXdYm9L2gpOmEVTYi06Aj909sw=; b=QD/xfQT3f3zPNtU0CpUKUszIr/ DmgiOuIdDC/UzGsJhJML3m8II/fRHsRmFWXEkLydv+z+sBLHF6qko4JqOLk9nmfvodumKNSBrsxuP h3VccNDgL8VfFBCLP0gvLcJFJ; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:41092 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pFnqf-000mJw-C2; Wed, 11 Jan 2023 20:01:49 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 70/79] Rename to allow_opencl_tests Date: Wed, 11 Jan 2023 20:00:43 -0700 Message-Id: <20230112030052.3306113-71-tom@tromey.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230112030052.3306113-1-tom@tromey.com> References: <20230112030052.3306113-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1pFnqf-000mJw-C2 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:41092 X-Source-Auth: tom+tromey.com X-Email-Count: 71 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This changes skip_opencl_tests to invert the sense, and renames it to allow_opencl_tests. --- gdb/testsuite/gdb.opencl/callfuncs.exp | 2 +- gdb/testsuite/gdb.opencl/convs_casts.exp | 2 +- gdb/testsuite/gdb.opencl/datatypes.exp | 2 +- gdb/testsuite/gdb.opencl/operators.exp | 2 +- gdb/testsuite/gdb.opencl/vec_comps.exp | 2 +- gdb/testsuite/lib/opencl.exp | 16 ++++++++-------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/gdb.opencl/callfuncs.exp b/gdb/testsuite/gdb.opencl/callfuncs.exp index 98b34ab08cd..1fa3f8abcb0 100644 --- a/gdb/testsuite/gdb.opencl/callfuncs.exp +++ b/gdb/testsuite/gdb.opencl/callfuncs.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "callfuncs" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/gdb.opencl/convs_casts.exp b/gdb/testsuite/gdb.opencl/convs_casts.exp index 9764d75fcb5..d648b7f6f0d 100644 --- a/gdb/testsuite/gdb.opencl/convs_casts.exp +++ b/gdb/testsuite/gdb.opencl/convs_casts.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "convs_casts" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/gdb.opencl/datatypes.exp b/gdb/testsuite/gdb.opencl/datatypes.exp index 69d07e7b695..b59567f65e2 100644 --- a/gdb/testsuite/gdb.opencl/datatypes.exp +++ b/gdb/testsuite/gdb.opencl/datatypes.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "datatypes" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/gdb.opencl/operators.exp b/gdb/testsuite/gdb.opencl/operators.exp index 31a7ee87873..a70e169112d 100644 --- a/gdb/testsuite/gdb.opencl/operators.exp +++ b/gdb/testsuite/gdb.opencl/operators.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "operators" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/gdb.opencl/vec_comps.exp b/gdb/testsuite/gdb.opencl/vec_comps.exp index 1ea2bd9d7ec..4c9f8012b79 100644 --- a/gdb/testsuite/gdb.opencl/vec_comps.exp +++ b/gdb/testsuite/gdb.opencl/vec_comps.exp @@ -19,7 +19,7 @@ load_lib opencl.exp -require !skip_opencl_tests +require allow_opencl_tests set testfile "vec_comps" set clprogram [remote_download target ${srcdir}/${subdir}/${testfile}.cl] diff --git a/gdb/testsuite/lib/opencl.exp b/gdb/testsuite/lib/opencl.exp index 3f1b364fa00..4c66d2a9ecd 100644 --- a/gdb/testsuite/lib/opencl.exp +++ b/gdb/testsuite/lib/opencl.exp @@ -27,13 +27,13 @@ proc gdb_compile_opencl_hostapp {clsource executable options} { return [gdb_compile ${src} ${binfile} "executable" ${options_opencl}] } -# Run a test on the target to check if it supports OpenCL. Return 0 if so, 1 if +# Run a test on the target to check if it supports OpenCL. Return 1 if so, 0 if # it does not. -gdb_caching_proc skip_opencl_tests { +gdb_caching_proc allow_opencl_tests { global srcdir objdir subdir gdb_prompt global inferior_exited_re - set me "skip_opencl_tests" + set me "allow_opencl_tests" # Set up, compile, and execute an OpenCL program. Include the current # process ID in the file name of the executable to prevent conflicts with @@ -46,8 +46,8 @@ gdb_caching_proc skip_opencl_tests { if { [gdb_compile_opencl_hostapp "${clprogram}" "${executable}" "${compile_flags}" ] != "" } { remote_file target delete ${clprogram} - verbose "$me: compiling OpenCL binary failed, returning 1" 2 - return 1 + verbose "$me: compiling OpenCL binary failed, returning 0" 2 + return 0 } # Compilation succeeded so now run it via gdb. @@ -56,15 +56,15 @@ gdb_caching_proc skip_opencl_tests { gdb_expect 30 { -re ".*$inferior_exited_re normally.*${gdb_prompt} $" { verbose -log "\n$me: OpenCL support detected" - set result 0 + set result 1 } -re ".*$inferior_exited_re with code.*${gdb_prompt} $" { verbose -log "\n$me: OpenCL support not detected" - set result 1 + set result 0 } default { verbose -log "\n$me OpenCL support not detected (default case)" - set result 1 + set result 0 } } gdb_exit