From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 037CE3857813; Tue, 14 Sep 2021 10:42:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 037CE3857813 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-3523] testsuite: fix failing pytest tests X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: bd55fa102715c7442c050b193dadfdb5337e2377 X-Git-Newrev: e2103982da7be8781900653a5f7c5a5d0a57d38a Message-Id: <20210914104259.037CE3857813@sourceware.org> Date: Tue, 14 Sep 2021 10:42:59 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2021 10:42:59 -0000 https://gcc.gnu.org/g:e2103982da7be8781900653a5f7c5a5d0a57d38a commit r12-3523-ge2103982da7be8781900653a5f7c5a5d0a57d38a Author: Martin Liska 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)