Make Progress support an arbitrary number of columns.

googletest/trace_test_cases.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Traces each test cases of a google-test executable individually.
 
 Gives detailed information about each test case. The logs can be read afterward
 with ./trace_inputs.py read -l /path/to/executable.logs
 """
@@ skipping 82 matching lines @@
   # Try to do black magic here by guessing a few of the run_test_cases.py
   # flags. It's cheezy but it works.
   for i, v in enumerate(cmd):
     if v.endswith('run_test_cases.py'):
       # Found it. Process the arguments here.
       _, options, _ = run_test_cases.process_args(cmd[i:])
       # Always override with the lowest value.
       jobs = min(options.jobs, jobs)
       break
 
-  progress = threading_utils.Progress(len(test_cases))
+  columns = [('index', 0), ('size', len(test_cases))]
+  progress = threading_utils.Progress(columns)
   with threading_utils.ThreadPoolWithProgress(
       progress, jobs, jobs, len(test_cases)) as pool:
     with api.get_tracer(logname) as tracer:
       function = Tracer(tracer, cmd, cwd_dir, progress).map
       for test_case in test_cases:
         pool.add_task(0, function, test_case)
 
       results = pool.join()
   print('')
   return results
@@ skipping 83 matching lines @@
       options.jobs,
       logname)
   print('Reading trace logs...')
   blacklist = trace_inputs.gen_blacklist(options.trace_blacklist)
   write_details(logname, options.out, options.root_dir, blacklist, results)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())