summaryrefslogtreecommitdiff
path: root/piglit-summary.py
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2013-04-20 20:24:46 -0700
committerEric Anholt <eric@anholt.net>2013-05-13 13:51:01 -0700
commitb9c4f96774bd27f09a1ab7bb8cecd0d125f90171 (patch)
treeb9ff3d5da00424c57eba6a18352d8c43fc0fab25 /piglit-summary.py
parent80071932c6777f3b31a55a616682cdbf2998aca4 (diff)
python: Convert tabs to spaces
PEP 8 specifies that all indents should be either 4 spaces or an equivalent tab indent, but without mixing tabs and spaces, with a preference for spaces over tabs because they are absolute. Tabs and spaces should not be mixed because they lead to expected indent level errors. Currently piglit uses a mixture of spaces and tabs, this patch uses the python tools reindent.py to convert the tabs to spaces. Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> v2: Rebase against master, fix apparent unintentional unindentation of help text in piglit-summary.py (changes by anholt) Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'piglit-summary.py')
-rwxr-xr-xpiglit-summary.py180
1 files changed, 90 insertions, 90 deletions
diff --git a/piglit-summary.py b/piglit-summary.py
index 6f4c8316f..5169cc44e 100755
--- a/piglit-summary.py
+++ b/piglit-summary.py
@@ -43,7 +43,7 @@ import framework.summary
##### Main program
#############################################################################
def usage():
- USAGE = """\
+ USAGE = """\
Usage: %(progName)s [options] resultsfile [...]
Print path/name of each test and the result.
@@ -62,102 +62,102 @@ Example list file:
[ 'other.result' ]
]
"""
- print USAGE % {'progName': sys.argv[0]}
- sys.exit(1)
+ print USAGE % {'progName': sys.argv[0]}
+ sys.exit(1)
def parse_listfile(filename):
- file = open(filename, "r")
- code = file.read()
- file.close()
- return eval(code)
+ file = open(filename, "r")
+ code = file.read()
+ file.close()
+ return eval(code)
def loadresult(descr):
- result = core.loadTestResults(descr[0])
- if len(descr) > 1:
- result.__dict__.update(descr[1])
- return result
+ result = core.loadTestResults(descr[0])
+ if len(descr) > 1:
+ result.__dict__.update(descr[1])
+ return result
def main():
- try:
- options, args = getopt(sys.argv[1:], "hsdl:", [ "help", "summary", "diff", "list" ])
- except GetoptError:
- usage()
-
- OptionList = []
- CountsOnly = False
- DiffOnly = False
- for name, value in options:
- if name == "-h" or name == "--help":
- usage()
- elif name == "-s" or name == "--summary":
- CountsOnly = True
- elif name == "-d" or name == "--diff":
- DiffOnly = True
- elif name == "-l" or name == "--list":
- OptionList += parse_listfile(value)
-
- OptionList += [[name] for name in args[0:]]
-
- if len(args) == 0 and len(OptionList) == 0:
- usage()
-
- # make list of results
- results = []
- for result_dir in OptionList:
- results.append(loadresult(result_dir))
-
- summary = framework.summary.Summary(results)
-
- # possible test outcomes
- possible_results = [ "pass", "fail", "crash", "skip", "warn" ]
- if len(OptionList) > 1:
- possible_results.append("changes")
-
- # init the summary counters
- counts = {}
- for result in possible_results:
- counts[result] = 0
-
- # get all results
- all = summary.allTests()
-
- # sort the results list by path
- all = sorted(all, key=lambda test: test.path)
-
- # loop over the tests
- for test in all:
- results = []
- anyChange = False
- # loop over the results for multiple runs
- for j in range(len(summary.testruns)):
- outcome = test.results[j]['result'] # 'pass', 'fail', etc.
- # check for different results between multiple runs
- if len(results) >= 1 and not outcome in results:
- # something changed
- counts["changes"] += 1
- anyChange = True
- results.append(outcome)
-
- # if all test runs had the same outcome:
- if not anyChange:
- counts[outcome] += 1
-
- # print the individual test result line
- if DiffOnly:
- if anyChange:
- print "%s: %s" % (test.path, string.join(results," "))
- elif not CountsOnly:
- print "%s: %s" % (test.path, string.join(results," "))
-
- # print the summary info
- print "summary:"
- total = 0
- for result in possible_results:
- print " %7s: %5d" % (result, counts[result])
- total += counts[result]
- print " total: %5d" % total
+ try:
+ options, args = getopt(sys.argv[1:], "hsdl:", [ "help", "summary", "diff", "list" ])
+ except GetoptError:
+ usage()
+
+ OptionList = []
+ CountsOnly = False
+ DiffOnly = False
+ for name, value in options:
+ if name == "-h" or name == "--help":
+ usage()
+ elif name == "-s" or name == "--summary":
+ CountsOnly = True
+ elif name == "-d" or name == "--diff":
+ DiffOnly = True
+ elif name == "-l" or name == "--list":
+ OptionList += parse_listfile(value)
+
+ OptionList += [[name] for name in args[0:]]
+
+ if len(args) == 0 and len(OptionList) == 0:
+ usage()
+
+ # make list of results
+ results = []
+ for result_dir in OptionList:
+ results.append(loadresult(result_dir))
+
+ summary = framework.summary.Summary(results)
+
+ # possible test outcomes
+ possible_results = [ "pass", "fail", "crash", "skip", "warn" ]
+ if len(OptionList) > 1:
+ possible_results.append("changes")
+
+ # init the summary counters
+ counts = {}
+ for result in possible_results:
+ counts[result] = 0
+
+ # get all results
+ all = summary.allTests()
+
+ # sort the results list by path
+ all = sorted(all, key=lambda test: test.path)
+
+ # loop over the tests
+ for test in all:
+ results = []
+ anyChange = False
+ # loop over the results for multiple runs
+ for j in range(len(summary.testruns)):
+ outcome = test.results[j]['result'] # 'pass', 'fail', etc.
+ # check for different results between multiple runs
+ if len(results) >= 1 and not outcome in results:
+ # something changed
+ counts["changes"] += 1
+ anyChange = True
+ results.append(outcome)
+
+ # if all test runs had the same outcome:
+ if not anyChange:
+ counts[outcome] += 1
+
+ # print the individual test result line
+ if DiffOnly:
+ if anyChange:
+ print "%s: %s" % (test.path, string.join(results," "))
+ elif not CountsOnly:
+ print "%s: %s" % (test.path, string.join(results," "))
+
+ # print the summary info
+ print "summary:"
+ total = 0
+ for result in possible_results:
+ print " %7s: %5d" % (result, counts[result])
+ total += counts[result]
+ print " total: %5d" % total
if __name__ == "__main__":
- main()
+ main()