public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-3523] testsuite: fix failing pytest tests
Date: Tue, 14 Sep 2021 10:42:59 +0000 (GMT)	[thread overview]
Message-ID: <20210914104259.037CE3857813@sourceware.org> (raw)

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

commit r12-3523-ge2103982da7be8781900653a5f7c5a5d0a57d38a
Author: Martin Liska <mliska@suse.cz>
Date:   Tue Sep 14 12:41:29 2021 +0200

    testsuite: fix failing pytest tests
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/gcov/gcov.py: Fix failing pytests as gcov.json.gz
              filename was changed in b777f228b481ae881a7fbb09de367a053740932c.

Diff:
---
 gcc/testsuite/g++.dg/gcov/gcov.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/g++.dg/gcov/gcov.py b/gcc/testsuite/g++.dg/gcov/gcov.py
index a8c4ea9ae71..5137f3a6872 100644
--- a/gcc/testsuite/g++.dg/gcov/gcov.py
+++ b/gcc/testsuite/g++.dg/gcov/gcov.py
@@ -5,6 +5,9 @@ import os
 
 def gcov_from_env():
     # return parsed JSON content a GCOV_PATH file
-    json_filename = os.environ['GCOV_PATH'] + '.gcov.json.gz'
+    json_filename = os.environ['GCOV_PATH']
+    # strip extension
+    json_filename = json_filename[:json_filename.rindex('.')]
+    json_filename += '.gcov.json.gz'
     json_data = gzip.open(json_filename).read()
     return json.loads(json_data)


                 reply	other threads:[~2021-09-14 10:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210914104259.037CE3857813@sourceware.org \
    --to=marxin@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).