[commit: ghc] wip/perf-testsuite: Fix errors and difficulties related to pulling (9f3f184)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/perf-testsuite
Link       : http://ghc.haskell.org/trac/ghc/changeset/9f3f184a398978cef8f55433238b0a45fbfb366c/ghc

>---------------------------------------------------------------

commit 9f3f184a398978cef8f55433238b0a45fbfb366c
Merge: 4e6f338 7d0754a
Author: Jared Weakly <jweakly at pdx.edu>
Date:   Thu Aug 10 01:45:47 2017 -0700

    Fix errors and difficulties related to pulling



>---------------------------------------------------------------

9f3f184a398978cef8f55433238b0a45fbfb366c
 libraries/Cabal              |  2 +-
 libraries/Win32              |  2 +-
 libraries/binary             |  2 +-
 libraries/deepseq            |  2 +-
 libraries/parallel           |  2 +-
 libraries/process            |  2 +-
 libraries/time               |  2 +-
 libraries/unix               |  2 +-
 libraries/xhtml              |  2 +-
 testsuite/driver/runtests.py | 15 +++++++--------
 utils/haddock                |  2 +-
 11 files changed, 17 insertions(+), 18 deletions(-)

diff --cc testsuite/driver/runtests.py
index ce6f28e,0b119aa..2c724aa
--- a/testsuite/driver/runtests.py
+++ b/testsuite/driver/runtests.py
@@@ -57,35 -58,26 +58,36 @@@ parser.add_argument("--skipway", action
  parser.add_argument("--threads", type=int, help="threads to run simultaneously")
  parser.add_argument("--check-files-written", help="check files aren't written by multiple tests") # NOTE: This doesn't seem to exist?
  parser.add_argument("--verbose", type=int, choices=[0,1,2,3,4,5], help="verbose (Values 0 through 5 accepted)")
- perf_group.add_argument("--skip-perf-tests", action="store_true", help="skip performance tests")
- perf_group.add_argument("--only-perf-tests", action="store_true", help="Only do performance tests")
+ group.add_argument("--skip-perf-tests", action="store_true", help="skip performance tests")
+ group.add_argument("--only-perf-tests", action="store_true", help="Only do performance tests")
 -parser.add_argument("--use-git-notes", action="store_true", help="use git notes to store metrics. NOTE: This is expected to become the default and will eventually be taken out.")
 -parser.add_argument("--test-env=", help="Override default chosen test-env.")
  parser.add_argument("--junit", type=argparse.FileType('wb'), help="output testsuite summary in JUnit format")
 +parser.add_argument("--use-git-notes", action="store_true", help="use git notes to store metrics. NOTE: This is expected to become the default and will eventually be taken out.")
 +parser.add_argument("--test-env", default='local', help="Override default chosen test-env.")
  
+ 
  args = parser.parse_args()
  
 -for e in args.e:
 -    exec(e)
 +if args.e:
 +    for e in args.e:
 +        exec(e)
 +
 +if args.configfile:
 +    for arg in args.configfile:
 +        exec(open(arg).read())
  
 -for arg in args.config_file:
 -    exec(open(arg).read())
 +if args.config_file:
 +    for arg in args.config_file:
 +        exec(open(arg).read())
 +
 +if args.config:
 +    for arg in args.config:
 +        field, value = arg.split('=', 1)
 +        setattr(config, field, value)
 +
 +if args.rootdir:
 +    config.rootdirs = args.rootdir
  
 -for arg in args.config:
 -    field, value = arg.split('=', 1)
 -    setattr(config, field, value)
  
 -config.rootdirs = args.rootdir
  config.summary_file = args.summary_file
  config.no_print_summary = args.no_print_summary
  
@@@ -114,11 -106,9 +116,8 @@@ if args.verbose
  config.skip_perf_tests = args.skip_perf_tests
  config.only_perf_tests = args.only_perf_tests
  config.use_git_notes = args.use_git_notes
- 
- if args.test_env:
-         config.test_env = args.test_env
+ config.test_env = args.test_env
  
 -
  config.cygwin = False
  config.msys = False