Mercurial > hg > truffle
diff mx/commands.py @ 8607:c7672a325faf
search for classes containing annotations returns source file as well as class name
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 03 Apr 2013 10:08:42 +0200 |
| parents | 676a85b65481 |
| children | c1c0ca020d98 |
line wrap: on
line diff
--- a/mx/commands.py Wed Apr 03 00:20:46 2013 +0200 +++ b/mx/commands.py Wed Apr 03 10:08:42 2013 +0200 @@ -690,8 +690,8 @@ # Exclude all compiler tests and snippets excludes = ['com.oracle.graal.compiler.tests.*', 'com.oracle.graal.jtt.*'] for p in mx.projects(): - excludes += _find_classes_with_annotations(p, None, ['@Snippet', '@ClassSubstitution', '@Test'], includeInnerClasses=True) - excludes += p.find_classes_with_matching_source_line(None, lambda line: 'JaCoCo Exclude' in line, includeInnerClasses=True) + excludes += _find_classes_with_annotations(p, None, ['@Snippet', '@ClassSubstitution', '@Test'], includeInnerClasses=True).keys() + excludes += p.find_classes_with_matching_source_line(None, lambda line: 'JaCoCo Exclude' in line, includeInnerClasses=True).keys() includes = ['com.oracle.graal.*', 'com.oracle.max.*'] agentOptions = { @@ -732,7 +732,7 @@ classes = [] for p in mx.projects(): - classes += _find_classes_with_annotations(p, None, annotations) + classes += _find_classes_with_annotations(p, None, annotations).keys() if len(pos) != 0: classes = [c for c in classes if containsAny(c, pos)]