changeset 14767:ded08e344e4a

findbugs will also use any findbugsExcludeFilter.xml it finds in a suite's root
author Doug Simon <doug.simon@oracle.com>
date Wed, 26 Mar 2014 17:30:40 +0100
parents 5823c399e28f
children 3e9a960f0da1
files mx/mx_graal.py
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Wed Mar 26 14:43:50 2014 +0100
+++ b/mx/mx_graal.py	Wed Mar 26 17:30:40 2014 +0100
@@ -1695,8 +1695,17 @@
     nonTestProjects = [p for p in mx.projects() if not p.name.endswith('.test') and not p.name.endswith('.jtt')]
     outputDirs = [p.output_dir() for p in nonTestProjects]
     findbugsResults = join(_graal_home, 'findbugs.results')
-    exitcode = mx.run_java(['-jar', findbugsJar, '-textui', '-low', '-maxRank', '15', '-exclude', join(_graal_home, 'graal', 'findbugsExcludeFilter.xml'),
-                 '-auxclasspath', mx.classpath([p.name for p in nonTestProjects]), '-output', findbugsResults, '-progress', '-exitcode'] + args + outputDirs, nonZeroIsFatal=False)
+    
+    cmd = ['-jar', findbugsJar, '-textui', '-low', '-maxRank', '15', '-exclude', join(_graal_home, 'graal', 'findbugsExcludeFilter.xml')]
+    for s in mx.suites():
+        filt = join(s.dir, 'findbugsExcludeFilter.xml')
+        if exists(filt):
+            cmd.append('-exclude')
+            cmd.append(filt)
+    if sys.stdout.isatty():
+        cmd.append('-progress')
+    cmd = cmd + ['-auxclasspath', mx.classpath([p.name for p in nonTestProjects]), '-output', findbugsResults, '-progress', '-exitcode'] + args + outputDirs 
+    exitcode = mx.run_java(cmd, nonZeroIsFatal=False)
     if exitcode != 0:
         with open(findbugsResults) as fp:
             mx.log(fp.read())