From patchwork Fri Dec 16 09:13:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 33915 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp858040wrn; Fri, 16 Dec 2022 01:13:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXtaZKD1jyjCPcY6CBSiieLqHBxqj4/7cGqOxRXlZIMEpgw5TCn7skB3KbtjxK2SpoFNbI3K X-Received: by 2002:a17:907:a78a:b0:7c0:ac4b:8b9 with SMTP id vx10-20020a170907a78a00b007c0ac4b08b9mr116641ejc.14.1671182031726; Fri, 16 Dec 2022 01:13:51 -0800 (PST) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qa38-20020a17090786a600b007acef3bec44si1967507ejc.221.2022.12.16.01.13.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 01:13:51 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="I/OjnIlr"; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 846DB384C359 for ; Fri, 16 Dec 2022 09:13:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 846DB384C359 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671182030; bh=t3KYagn264KAnF93xVQK+Fm9zIzGGRnvp3K0oggszYM=; h=Date:Subject:To:Cc:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=I/OjnIlrenlpUUIQD1U0u6fmiyYVZdVxBd50UVOMcCt/MFeSOrIRB1qo7+C+VoY+Q QMkzYGIdPRLsU+HUan7PZEEePitxbMS9O8lwyIRy4kPHCzW2gYv4iMdEjb7BuEE2Jd dxWCF+7rsv0VLUpNIBONYRCtcOd3M/u137aWVBMQ= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2087.outbound.protection.outlook.com [40.107.22.87]) by sourceware.org (Postfix) with ESMTPS id 0EBA6383A0D0 for ; Fri, 16 Dec 2022 09:13:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0EBA6383A0D0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fji9MfBfgbeakQo6a0Htda8FT4PhhPPn2i8PaVznyPiaZBsXyYbRQPO34aTeIafnghlF6TAyAI7qHJP+4Lb795To8zaP8bu33y84TGhTYR15yPVtfNAywfY+hGmOw9XmN/mJtEq2PeoWUJuv1WiI8m86qrM49d0UvrBh1LTmMFTE2R8qrdT7mgu4sHnUDqsrh0h5OxWWT3kWsBzHiIQKYjPB/QS9cccAGllXYFNjDtCi8Ph/arPDN+Wz2O05GnGsgmfhQT/34zY/uFJcTGJ9C7tAQj/q2eynkB9z9nuvYwWf1duStGoljSFvhZmjo0le7wQR0+ms3QtvxZao6NoS4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t3KYagn264KAnF93xVQK+Fm9zIzGGRnvp3K0oggszYM=; b=fiC5UnSr7QcUxfanYE+D6NTei5Ro/hS3YgkFkfV+ZVgZCwytlytbQ0czOd2JS1Oft8CburJSFnScZUEFC+IHAseKgG5epDaxg8PrK2MqXGctETSMUAU6upUpvAIDpNlMB6GdZECvvyNUXSo0I5zeF2oyWEBAixVcc39AuUKdvRDZaLt933cwpDNekOfMI8y3chsX8iATwsBdGndotYjHB28AmwJhE0/6gngf/c/buCNIHUE7zUlNRTfwezEgLDeQ43lXkV7U/273aj03saoQ67RhFiZwOwTmYuT+aHYaMR0aaVX4EZ8lv90RJqSjew6/3m66zWXmJnRLYKs9I+ae3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by PR3PR04MB7306.eurprd04.prod.outlook.com (2603:10a6:102:81::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.11; Fri, 16 Dec 2022 09:13:37 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5924.011; Fri, 16 Dec 2022 09:13:37 +0000 Message-ID: <0acc18cc-d246-9c2a-ba14-586c693b9e58@suse.com> Date: Fri, 16 Dec 2022 10:13:36 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: [PATCH 5/4] gprofng/testsuite: skip Java test without JDK Content-Language: en-US To: Vladimir Mezentsev Cc: Binutils References: In-Reply-To: X-ClientProxiedBy: FR3P281CA0110.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::7) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|PR3PR04MB7306:EE_ X-MS-Office365-Filtering-Correlation-Id: a4e97e42-07fd-4582-b44c-08dadf45d0e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iRU97EzLnDyMt0j/crLtobxj+lNKoPrU+fCh1O6M9l8Q5YEOLQx3x5iZd5JEE6/VMelC3m2VLeESqqyiQqT0wnyw5d2cRPUlZKg0jWo1gr3zis+U4N6BFRjz268WxzRm7pXbiJcrbJ+0Ok27Ae7fE9cSJ4/8J+nhVSikqzBzQmJSBmE6zbpjP4d9FwFUvFtZMB2TNPqVaTqzE0GrxH8GjSdUHsx96wWRwHizwLZcDRqtS5vwEqejJVYQ+LU4wVKoqNZFwjgQiUPu/D3HMtOGCCUIgS3g0vSH6bkP8DQB+4rA7DjMtuWwLenPNbd1TdHHRgsfS07AoAbwSoT6Q90SzPEhHEvz53SjIIawI79piW+b/TXHiVhTra+QXeb+QcoDxkNVRqNBvYEo+I1qcZwVn54pUIe2TR4ImfT1NBMLjnnxRWeLGMLTY+G7Dy35vyzKDp8gbLP9FbBhg+ticw4QCKJI7DjqRAIAfEgurDl719PEhEOag3+C2SZluVc03KIUtRvR0olJYm3S3pMWQoXh9nmVCivf/3KRjx0Hb9aVoY1yRNGBjsy6JrMy++Nu6s2v4Xns7dDu5E3Lo+/glhHE+ZxiWjq+l4PPxdyVYo2cIUk5AnssiQ/0nG0/KoqVBMVl0/eZYyzE5n/K3TFeuW1YHy6dDMwQWt57EdJC4ol/8YJO/HOFWLuVuOZshml/CiUdSS+xc6rFEayZ12gZVA4rMkvuB/60G3iLs4BG0JfPLsc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6560.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(396003)(366004)(136003)(376002)(39860400002)(451199015)(36756003)(6916009)(66556008)(316002)(66946007)(86362001)(41300700001)(4326008)(66476007)(83380400001)(38100700002)(31696002)(6506007)(8676002)(8936002)(5660300002)(31686004)(2906002)(186003)(478600001)(6512007)(6486002)(2616005)(26005)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?a9XhOiN9oO2k5Ib8lcJxyF1M2kpH?= =?utf-8?q?Oqwu9mEm6WJ9foOWpav7bOwXYY+GtHA7Jlm0TMYWXrxkgPoNPMaMB+bicRjkY6Crb?= =?utf-8?q?kQ8cweednMFktWkEGhfXmxppytXGrvICKMns0V0guB/kH/a6+tPChbvDtN2CruaBl?= =?utf-8?q?ydTBA8GcAjKZzQj780gENqaJn8HAJuVTNz7iZe2EtDxMv8oWlWO6+3ZjbFi+MBaA4?= =?utf-8?q?zoj3WPw9q7iM37l/AZChXXa+O+ZY7b9tiERZf6ttdeT0vvu7sXQPA2vDpYtgaCxYg?= =?utf-8?q?+ap7OgPl7Z5vwssqRMuUVVAh4smFtl32376l6VBUiomE8fetrRL3ewHXZLQWiCO84?= =?utf-8?q?BWGsqvVhV6XiyPvie3TbCOmX64crs9rP3wRnaNzkuGVdmrpqa9d54m3FxzyHgnr7P?= =?utf-8?q?PTRNvapZSGjrIxk2U0ricBlBnuiJs12TqSe5S1IuEkx0QA7QVNYvQNA7N8CZLaZps?= =?utf-8?q?qm+WM7YufPQhL/aYzJVKvr5Ip89xL1R3ABt+szbrk/58nnVfmUKTbhAOieJOCYbz5?= =?utf-8?q?leCkgmmi9XZK9FVdf19eDRbaJGL1JnLSndUTTnOdj8J+fC1zAwOuXxXeQLWSosrF0?= =?utf-8?q?HXVKOfEyCTzgPeXtfw4SoSzq9uUQT9/zmzONU889j0mUqCrNZdSeKWdQJM2ELhDDZ?= =?utf-8?q?Vs0Y4GiDmjYorIDGm4hcfxdcT7YsjcN/s7/D/+52ML8sQfeClhWq25qAFurz5WLw5?= =?utf-8?q?YE0/jO5IueSb6s2T7FZwf3u2iBGtOasP7VzCD6cFjJFX4nZAUYoeLW2foyzPYFwlZ?= =?utf-8?q?ET6M33fSCxq8DD6EA2PCPxgGeyPseVYFuPM6O44mkRGRNym3UOhg4HO1j8fLKLWGR?= =?utf-8?q?MKn6EJlSr0onyVpzIYXFDjk6o1738OG564b1IKM3AqmVmYth29VvXjucL0u4Ld/Sb?= =?utf-8?q?C297aN811BEODAV+RJCUZlSZKuFwkeGVuPczmL8WlQGius+Nav8IC+wvR7F86z2jN?= =?utf-8?q?NFIUthLHunayjZ9z7eVETVUeeo4FIdRPkbT4mHUfbksf/Sh5I+TdQFh7sZpyvUf34?= =?utf-8?q?J4HOhOg0792BLI8HvV7wH6BcQMjOQkanPTON/iqqtaZMjbCsZQ6CISaS2IbsfGLeV?= =?utf-8?q?nc16pB+GDXfsT7eLbjxBTb1MzudE6ktkeU0OuJuGrbngCMg6wuxje5QFe7obRUkCI?= =?utf-8?q?lwx2biNWAh2dW4eRekT/U4MpDBG6+YbBSFCq5bI3xadtFLkjfyTLHcqmM0rQ4QkuV?= =?utf-8?q?CRs73ou7CFuT8QKwbCoK9cRl9A/E6J6uK1WchkKZYxijJlw/t+IcJsILnoXj0Fj99?= =?utf-8?q?YyeAta8d6GKUe1v7BlLyYboW/XWtC1RKfeXWB01Zsv+7OpBxFtWlUtd1pGRtyw6aS?= =?utf-8?q?dW8bcpnCwsaIxTZiCSuZxRkEmVE6GsCq9l6ij3H1GDjepQm9kqiBzo4WyUah5vt+u?= =?utf-8?q?mO0h2F33PJ0gilAsJy4ewoDTZAglhcB4YgATMz8bBqjb6NqOO7TIZlzfaSa6F/AiO?= =?utf-8?q?N0MV8DtONeTyaqa764nyQXGeRsO3ApQ7UbsNZsuUf8UzVQaMHOHJj9rXhWqO94CTO?= =?utf-8?q?NGXHBPaVJD8g?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4e97e42-07fd-4582-b44c-08dadf45d0e7 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2022 09:13:37.8179 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cdLGhZyLP8YgXGX73oQ+O1W9e7aI1RjRAk+BJZW32wWwGiEp1lOob9kZNaImBgc+pJ7Fx9v0zuH9GM92LnSPkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7306 X-Spam-Status: No, score=-3028.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752361370248989328?= X-GMAIL-MSGID: =?utf-8?q?1752361370248989328?= There's no point in even trying the Java test when gprofng was built without Java support, and when the building of the constituents of the testcase also would fail. On such systems this converts the respective tests from "unresolved" to "unsupported", making the overall testsuite run no longer report failure just because of this. --- An alternative without changing display.exp would look to be to force GPROFNG_BROKEN_JAVAC to "yes" in the runtest invocation if $jdk_inc is empty. --- a/gprofng/Makefile.am +++ b/gprofng/Makefile.am @@ -61,6 +61,7 @@ check-DEJAGNU: site.exp development.exp runtest=$(RUNTEST); \ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \ + JDK_INC="$(jdk_inc)" \ GPROFNG_BROKEN_JAVAC="$(GPROFNG_BROKEN_JAVAC)" \ MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS) $(PTHREAD_CFLAGS)" \ LDFLAGS="$(LDFLAGS)" LIBS="$(PTHREAD_LIBS) $(LIBS)" \ --- a/gprofng/Makefile.in +++ b/gprofng/Makefile.in @@ -938,6 +938,7 @@ uninstall-am: @TCL_TRY_TRUE@ runtest=$(RUNTEST); \ @TCL_TRY_TRUE@ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ @TCL_TRY_TRUE@ $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \ +@TCL_TRY_TRUE@ JDK_INC="$(jdk_inc)" \ @TCL_TRY_TRUE@ GPROFNG_BROKEN_JAVAC="$(GPROFNG_BROKEN_JAVAC)" \ @TCL_TRY_TRUE@ MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS) $(PTHREAD_CFLAGS)" \ @TCL_TRY_TRUE@ LDFLAGS="$(LDFLAGS)" LIBS="$(PTHREAD_LIBS) $(LIBS)" \ --- a/gprofng/testsuite/gprofng.display/display.exp +++ b/gprofng/testsuite/gprofng.display/display.exp @@ -54,6 +54,7 @@ switch $pltf { } } +global JDK_INC global GPROFNG_BROKEN_JAVAC foreach line $table { @@ -63,7 +64,8 @@ foreach line $table { verbose [file rootname $line] verbose running display test $line - if { $GPROFNG_BROKEN_JAVAC == "yes" && $dir == "jsynprog" } { + if { $dir == "jsynprog" + && ($JDK_INC == "" || $GPROFNG_BROKEN_JAVAC == "yes") } { unsupported $dir } else { run_display_test $dir $cflags $gprofflags