From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <marxin@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1851)
 id 37CC8385781A; Wed, 19 Jan 2022 06:40:18 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 37CC8385781A
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Martin Liska <marxin@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-6718] testsuite: fix pytest detection unsupported message.
X-Act-Checkin: gcc
X-Git-Author: Martin Liska <mliska@suse.cz>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: fc6cd798c07a94d6b0bcc16b175e6e5d6e594c7e
X-Git-Newrev: b01d2059c703d447827cc82e0e27e460a38bfa9f
Message-Id: <20220119064018.37CC8385781A@sourceware.org>
Date: Wed, 19 Jan 2022 06:40:18 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jan 2022 06:40:18 -0000

https://gcc.gnu.org/g:b01d2059c703d447827cc82e0e27e460a38bfa9f

commit r12-6718-gb01d2059c703d447827cc82e0e27e460a38bfa9f
Author: Martin Liska <mliska@suse.cz>
Date:   Wed Jan 19 07:37:42 2022 +0100

    testsuite: fix pytest detection unsupported message.
    
            PR testsuite/104109
    
    gcc/testsuite/ChangeLog:
    
            * lib/gcov.exp: Fix pytest detection unsupported message.

Diff:
---
 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\]*"