Mercurial > hg > graal-compiler
diff mx/mx_graal.py @ 15917:7c84f0ce7cae
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 26 May 2014 18:55:21 +0200 |
parents | 6aa352b260f4 67e0015b21d6 |
children | d676c4beeab8 |
line wrap: on
line diff
--- a/mx/mx_graal.py Mon May 26 18:55:06 2014 +0200 +++ b/mx/mx_graal.py Mon May 26 18:55:21 2014 +0200 @@ -970,7 +970,7 @@ f_testfile.close() harness(projectscp, vmArgs) -def _unittest(args, annotations, prefixcp="", whitelist=None, verbose=False, enable_timing=False, regex=None, color=False, eager_stacktrace=False): +def _unittest(args, annotations, prefixcp="", whitelist=None, verbose=False, enable_timing=False, regex=None, color=False, eager_stacktrace=False, gc_after_test=False): mxdir = dirname(__file__) name = 'JUnitWrapper' javaSource = join(mxdir, name + '.java') @@ -993,6 +993,8 @@ coreArgs.append('-JUnitColor') if eager_stacktrace: coreArgs.append('-JUnitEagerStackTrace') + if gc_after_test: + coreArgs.append('-JUnitGCAfterTest') def harness(projectscp, vmArgs): @@ -1025,6 +1027,7 @@ --regex <regex> run only testcases matching a regular expression --color enable colors output --eager-stacktrace print stacktrace eagerly + --gc-after-test force a GC after each test To avoid conflicts with VM options '--' can be used as delimiter. @@ -1067,6 +1070,7 @@ parser.add_argument('--regex', help='run only testcases matching a regular expression', metavar='<regex>') parser.add_argument('--color', help='enable color output', action='store_true') parser.add_argument('--eager-stacktrace', help='print stacktrace eagerly', action='store_true') + parser.add_argument('--gc-after-test', help='force a GC after each test', action='store_true') ut_args = [] delimiter = False @@ -1824,7 +1828,7 @@ out = args[0] elif len(args) > 1: mx.abort('jacocoreport takes only one argument : an output directory') - mx.run_java(['-jar', jacocoreport.get_path(True), '-in', 'jacoco.exec', '-g', join(_graal_home, 'graal'), out]) + mx.run_java(['-jar', jacocoreport.get_path(True), '--in', 'jacoco.exec', '--out', out] + [p.dir for p in mx.projects()]) def sl(args): """run an SL program"""