public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-3523] testsuite: fix failing pytest tests
@ 2021-09-14 10:42 Martin Liska
  0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2021-09-14 10:42 UTC (permalink / raw)
  To: gcc-cvs

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)


^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2021-09-14 10:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-14 10:42 [gcc r12-3523] testsuite: fix failing pytest tests Martin Liska

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).