From patchwork Wed Jan 19 06:40:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 50217 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 F36953857C63 for ; Wed, 19 Jan 2022 06:41:07 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 053B73857C65 for ; Wed, 19 Jan 2022 06:40:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 053B73857C65 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DE9992110B; Wed, 19 Jan 2022 06:40:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1642574403; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+sjIfzEG541e0kzSv5f7rCwyZXM7CIk9XklcV12tiu8=; b=JBnRr313zwcYx9i9hO/8eoKS5B/JhkEcV48DVaNo7OdUxVVn6fcfC56lB9P60WaUfu8Ogn 65AfZJRefbwFS6LAtJjOv4xZ6LD6MszY3bXh08WXYjy5HeZuHXcaQtSOZKdNZzZuC0HILI ulPgf0YUaUB+HQR9+iBJ5/wtnxwV+FU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1642574403; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+sjIfzEG541e0kzSv5f7rCwyZXM7CIk9XklcV12tiu8=; b=yj9XG1d2u6Jom43mWINyhjaG7v84Ex9Q2yh0uMv+3IkXGJmnrfFEyMGs+stgV8NvNc2os2 sq5PIHmhmOy6LzCw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C3D7713419; Wed, 19 Jan 2022 06:40:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id iRTlLEOy52HHUgAAMHmgww (envelope-from ); Wed, 19 Jan 2022 06:40:03 +0000 Message-ID: <1e05cf34-790c-9b55-e50a-05b8c07d67b6@suse.cz> Date: Wed, 19 Jan 2022 07:40:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH][pushed] testsuite: fix pytest detection unsupported message. To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" PR testsuite/104109 gcc/testsuite/ChangeLog: * lib/gcov.exp: Fix pytest detection unsupported message. --- gcc/testsuite/lib/gcov.exp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/lib/gcov.exp b/gcc/testsuite/lib/gcov.exp index 6c57515e229..9d5b2cdb86b 100644 --- a/gcc/testsuite/lib/gcov.exp +++ b/gcc/testsuite/lib/gcov.exp @@ -276,14 +276,13 @@ proc run-gcov-pytest { args } { set testcase [remote_download host $testcase] set result [remote_exec host $GCOV "$testcase -i"] + set pytest_script [lindex $args 1] if { ![check_effective_target_pytest3] } { - unsupported "$script pytest python3 is missing" + unsupported "$pytest_script pytest python3 is missing" return } - set pytest_script [lindex $args 1] setenv GCOV_PATH $testcase - verbose "pytest_script: $srcdir $subdir $pytest_script" 2 spawn -noecho python3 -m pytest --color=no -rap -s --tb=no $srcdir/$subdir/$pytest_script set prefix "\[^\r\n\]*"