diff mx/mx_graal.py @ 18163:c88ab4f1f04a

re-enabled Checkstyle with the release of 6.0 that supports Java 8; fixed existing Checkstyle warnings
author Doug Simon <doug.simon@oracle.com>
date Fri, 24 Oct 2014 16:18:10 +0200
parents c4f649042a7b
children 8588db09f5e9
line wrap: on
line diff
--- a/mx/mx_graal.py	Thu Oct 23 17:20:10 2014 +0200
+++ b/mx/mx_graal.py	Fri Oct 24 16:18:10 2014 +0200
@@ -1533,6 +1533,10 @@
         with Task('BuildJavaWithJavac', tasks):
             build(['-p', '--no-native', '--force-javac'])
 
+        with Task('Checkstyle', tasks) as t:
+            if mx.checkstyle([]) != 0:
+                t.abort('Checkstyle warnings were found')
+
         with Task('Checkheaders', tasks) as t:
             if checkheaders([]) != 0:
                 t.abort('Checkheaders warnings were found')
@@ -2271,7 +2275,7 @@
         if p.native:
             continue
 
-        csConfig = join(mx.project(p.checkstyleProj).dir, '.checkstyle_checks.xml.disabled')
+        csConfig = join(mx.project(p.checkstyleProj).dir, '.checkstyle_checks.xml')
         dom = xml.dom.minidom.parse(csConfig)
         for module in dom.getElementsByTagName('module'):
             if module.getAttribute('name') == 'RegexpHeader':