[Piglit] [PATCH 2/4] piglit-merge-results.py: Convert from getopt to argparse

[Dylan Baker]

Creates a smaller, simpler file that should be easier to maintain going
forward.

Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>
---
 piglit-merge-results.py | 39 +++++++++------------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/piglit-merge-results.py b/piglit-merge-results.py
index 50430e7..79faf27 100755
--- a/piglit-merge-results.py
+++ b/piglit-merge-results.py
@@ -22,7 +22,7 @@
 # DEALINGS IN THE SOFTWARE.
 
 
-from getopt import getopt, GetoptError
+import argparse
 import sys, os.path
 
 sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
@@ -33,38 +33,17 @@ import framework.core as core
 #############################################################################
 ##### Main program
 #############################################################################
-def usage():
-	USAGE = """\
-Usage: %(progName)s [options] [main results file]
-
-Options:
-  -h, --help                Show this message
-
-Example:
-  %(progName)s results/main > results/summary
-"""
-	print USAGE % {'progName': sys.argv[0]}
-	sys.exit(1)
-
 def main():
-	try:
-		options, args = getopt(sys.argv[1:], "h", [ "help" ])
-	except GetoptError:
-		usage()
-
-	OptionName = ''
-
-	for name, value in options:
-		if name in ('-h', '--help'):
-			usage()
-
-	if len(args) < 2:
-		usage()
+	parser = argparse.ArgumentParser()
+	parser.add_argument("results",
+						metavar = "<First Results File>",
+						nargs   = "*",
+			            help    = "Space seperated list of results files")
+	args = parser.parse_args()
 
-	combined = core.loadTestResults(args[0])
-	del args[0]
+	combined = core.loadTestResults(args.results.pop(0))
 
-	for resultsDir in args:
+	for resultsDir in args.results:
 		results = core.loadTestResults(resultsDir)
 
 		for testname, result in results.tests.items():
-- 
1.8.1.4