public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH][PUSHED] testsuite: fix failing pytest tests
@ 2021-09-14 10:42 Martin Liška
  0 siblings, 0 replies; only message in thread
From: Martin Liška @ 2021-09-14 10:42 UTC (permalink / raw)
  To: gcc-patches

Pushed as obvious.

Martin

gcc/testsuite/ChangeLog:

	* g++.dg/gcov/gcov.py: Fix failing pytests as gcov.json.gz
	  filename was changed in b777f228b481ae881a7fbb09de367a053740932c.
---
  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)
-- 
2.33.0


^ 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 [PATCH][PUSHED] testsuite: fix failing pytest tests Martin Liška

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