This is an archive of the discontinued LLVM Phabricator instance.

[LNT] Python 3 support: fix text/binary confusion in importreport
ClosedPublic

Authored by thopre on Sep 30 2019, 6:57 AM.

Download Raw Diff

Details

Reviewers

cmatthews
hubert.reinterpretcast
kristof.beyls

Commits

rL373861: [LNT] Python 3 support: fix text/binary confusion in importreport

Summary

lnt importreport currently fails in Python 3 because it opens the input
and output file in binary mode. Yet, as per documentation, this tools
converts "*text based* key value pairs into a LNT json report file".
The JSON file is output using the json module which expects a file
opened in text mode so this commit changes the mode of both the input
and output file to text.

Diff Detail

Repository: rL LLVM

Event Timeline

thopre created this revision.Sep 30 2019, 6:57 AM

thopre added a parent revision: D68223: [LNT] Python 3 support: fix convert to JSON.Sep 30 2019, 6:57 AM

thopre added a child revision: D68225: [LNT] Python 3 support: encode LNT report format in UTF-8.

Harbormaster completed remote builds in B38749: Diff 222420.Sep 30 2019, 7:03 AM

Ping?

LGTM.

This revision is now accepted and ready to land.Oct 5 2019, 1:47 PM

Closed by commit rL373861: [LNT] Python 3 support: fix text/binary confusion in importreport (authored by thopre). · Explain WhyOct 6 2019, 11:32 AM

This revision was automatically updated to reflect the committed changes.

Herald added a project: Restricted Project. · View Herald TranscriptOct 6 2019, 11:32 AM

thopre removed a child revision: D68225: [LNT] Python 3 support: encode LNT report format in UTF-8.Dec 5 2019, 1:55 AM

thopre edited parent revisions, added: D68221: [LNT] Python 3 support: stable profile getFunctions output; removed: D68223: [LNT] Python 3 support: fix convert to JSON.Dec 5 2019, 2:07 AM

thopre added a child revision: D67882: [LNT] Python 3 support: remove useless var-setting getter.

Revision Contents

Path

Size

lnt/

trunk/

lnt/

lnttool/

import_report.py

4 lines

Diff 223433

lnt/trunk/lnt/lnttool/import_report.py

	import click			import click


	@click.command("importreport", short_help="import simple space separated "			@click.command("importreport", short_help="import simple space separated "
	"data into a report to submit.")			"data into a report to submit.")
	@click.argument("input", type=click.File('rb'), default="-", required=False)			@click.argument("input", type=click.File('r'), default="-", required=False)
	@click.argument("output", type=click.File('wb'), default="report.json",			@click.argument("output", type=click.File('w'), default="report.json",
	required=False)			required=False)
	@click.option("--testsuite", "suite", default="nts", show_default=True,			@click.option("--testsuite", "suite", default="nts", show_default=True,
	required=True, help="short name of the test suite to submit to")			required=True, help="short name of the test suite to submit to")
	@click.option("--order", required=True, help="Order to submit as number. "			@click.option("--order", required=True, help="Order to submit as number. "
	"Ex: a svn revision, or timestamp.")			"Ex: a svn revision, or timestamp.")
	@click.option("--machine", required=True,			@click.option("--machine", required=True,
	help="the name of the machine to submit under")			help="the name of the machine to submit under")
	def action_importreport(input, output, suite, order, machine):			def action_importreport(input, output, suite, order, machine):
	Show All 36 Lines