Mercurial > hg > truffle

comparison mx/commands.py @ 5881:472a648769e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better JaCoCo : only include com.oracle.graal.* and com.oracle.max.*, exclude com.oracle.graal.jtt.*
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 07 Aug 2012 21:44:53 -0700
parents 191e08da4de4
children 03c4c25ae726
comparison
equal deleted inserted replaced
5880:afd2508528f5 5881:472a648769e4
575 if mx.java().debug_port is not None: 575 if mx.java().debug_port is not None:
576 args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(mx.java().debug_port)] + args 576 args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(mx.java().debug_port)] + args
577 if _jacoco == 'on' or _jacoco == 'append': 577 if _jacoco == 'on' or _jacoco == 'append':
578 jacocoagent = mx.library("JACOCOAGENT", True) 578 jacocoagent = mx.library("JACOCOAGENT", True)
579 # Exclude all compiler tests and snippets 579 # Exclude all compiler tests and snippets
580 excludes = ['com.oracle.graal.compiler.tests.*'] 580 excludes = ['com.oracle.graal.compiler.tests.*', 'com.oracle.graal.jtt.*']
581 for p in mx.projects(): 581 for p in mx.projects():
582 excludes += _find_classes_with_annotations(p, None, ['@Snippet', '@ClassSubstitution'], includeInnerClasses=True) 582 excludes += _find_classes_with_annotations(p, None, ['@Snippet', '@ClassSubstitution'], includeInnerClasses=True)
583 excludes += p.find_classes_with_matching_source_line(None, lambda line: 'JaCoCo Exclude' in line, includeInnerClasses=True) 583 excludes += p.find_classes_with_matching_source_line(None, lambda line: 'JaCoCo Exclude' in line, includeInnerClasses=True)
584 584
585 includes = ['com.oracle.graal.*', 'com.oracle.max.*']
585 agentOptions = { 586 agentOptions = {
586 'append' : 'true' if _jacoco == 'append' else 'false', 587 'append' : 'true' if _jacoco == 'append' else 'false',
587 'bootclasspath' : 'true', 588 'bootclasspath' : 'true',
588 'includes' : 'com.oracle.*', 589 'includes' : ':'.join(includes),
589 'excludes' : ':'.join(excludes), 590 'excludes' : ':'.join(excludes),
590 'destfile' : 'jacoco.exec' 591 'destfile' : 'jacoco.exec'
591 } 592 }
592 args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args 593 args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args
593 exe = join(jdk, 'bin', mx.exe_suffix('java')) 594 exe = join(jdk, 'bin', mx.exe_suffix('java'))