From patchwork Sun Jun 14 09:14:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1308925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=f7JoNZCo; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49l8100Qzqz9sQx for ; Sun, 14 Jun 2020 19:14:26 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A12FC3840C27; Sun, 14 Jun 2020 09:14:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A12FC3840C27 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592126062; bh=czqDa4A95yshG5VBGGWbR3yOs9XzFq/mJ/kI8F2Aegg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=f7JoNZCou8XtTWmebaoNCnSQyC/xZn4KVdF84sd9u3mORGwupqw0liLa5D4vs7cqE UlWVUv6edniAl8JeLQZtRezEIRSD2sf5BdBiUWmlMs/LymZjlTPBV9Z4OTfI3grTt+ w3LwZL+3Rwuv+ogQHRdQgLVfnNh+Y9vnFddYcWP8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by sourceware.org (Postfix) with ESMTPS id A1AA7385DC00 for ; Sun, 14 Jun 2020 09:14:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A1AA7385DC00 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 49l80p1Y6mzQlKC; Sun, 14 Jun 2020 11:14:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id fNwoipOna_Hs; Sun, 14 Jun 2020 11:14:15 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [committed][GCC10/11] testsuite: Re-add gdc.test prefix in test names (PR testsuite/95575) Date: Sun, 14 Jun 2020 11:14:04 +0200 Message-Id: <20200614091404.25267-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 24B5417FA X-Rspamd-Score: 1.28 / 15.00 / 15.00 X-Spam-Status: No, score=-17.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, When moving the gdc-test.exp test script into multiple test scripts (c76df72f1a9), this subdir handling got removed. This patch re-adds that, adjusted to handle the new $subdir path. Regression tested on x86_64-linux-gnu, committed to mainline, and backported to releases/gcc-10. Regards Iain. gcc/testsuite/ChangeLog: PR testsuite/95575 * lib/gdc-utils.exp (gdc-do-test): Re-add $subdir link and inclusion in filename. --- gcc/testsuite/lib/gdc-utils.exp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/lib/gdc-utils.exp b/gcc/testsuite/lib/gdc-utils.exp index 5c17346dbf5..0e4f57c756d 100644 --- a/gcc/testsuite/lib/gdc-utils.exp +++ b/gcc/testsuite/lib/gdc-utils.exp @@ -403,6 +403,7 @@ proc gdc-permute-options { options } { proc gdc-do-test { testcases } { global dg-do-what-default + global subdir global verbose # If a testcase doesn't have special options, use these. @@ -430,27 +431,32 @@ proc gdc-do-test { testcases } { set saved-dg-do-what-default ${dg-do-what-default} + # Create gdc.test link so test names include that subdir. + set testdir [file dirname $subdir] + catch { file link $testdir . } + # Main loop. # set verbose 1 # set dg-final-code "" # Find all tests and pass to routine. foreach test $testcases { - regexp -- "(.*)/(.+)/(.+)\.(.+)$" $test match base dir name ext + regexp -- "(.*)/(.+)/(.+)\.(.+)$" $test match base type name ext # Convert to DG test. - set imports [format "-I%s/%s" $base $dir] + set imports [format "-I%s/%s" $base $type] set cleanup_extra_files "" - set compilable_do_what "assemble" - set filename "[gdc-convert-test $base $dir/$name.$ext]" + set compilable_do_what "assemble" + # Include $testdir prefix so test names follow DejaGnu conventions. + set filename "$testdir/[gdc-convert-test $base $type/$name.$ext]" - if { $dir == "runnable" } { + if { $type == "runnable" } { append PERMUTE_ARGS " $SHARED_OPTION" } set options [gdc-permute-options [lsort -unique $PERMUTE_ARGS]] - switch $dir { + switch $type { runnable_cxx - runnable { for { set i 0 } { $i<[llength $options] } { incr i } {