홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
3724a03b 1 parent 67f1c298

Another checkstyle fix for Jenkins 

Change-Id: I226aac8eac6911af833bfeb309be36b1c58831fe
Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
...@@ -111,8 +111,6 @@ def osgi_jar( ...@@ -111,8 +111,6 @@ def osgi_jar(
111 ### Checkstyle 111 ### Checkstyle
112 if srcs: 112 if srcs:
113 chk_cmd = '#!/bin/bash\n' 113 chk_cmd = '#!/bin/bash\n'
114 - # FIXME hack to add dependency on suppressions-xml in the checkstyle rule
115 - chk_cmd += 'FOO="$(location //tools/build/conf:suppressions-xml)"\n'
116 base = get_base_path() 114 base = get_base_path()
117 chk_cmd += ' '.join(( 'java -jar $(location //lib:checkstyle)', 115 chk_cmd += ' '.join(( 'java -jar $(location //lib:checkstyle)',
118 '-c $(location //tools/build/conf:checkstyle-xml)', 116 '-c $(location //tools/build/conf:checkstyle-xml)',
...@@ -131,7 +129,11 @@ def osgi_jar( ...@@ -131,7 +129,11 @@ def osgi_jar(
131 sh_test( 129 sh_test(
132 name = name + '-checkstyle', 130 name = name + '-checkstyle',
133 test = ':' + name + '-checkstyle-sh', 131 test = ':' + name + '-checkstyle-sh',
134 - deps = [ ':'+ bare_jar_name ], 132 + deps = [ ':'+ bare_jar_name,
133 + '//lib:checkstyle',
134 + '//tools/build/conf:checkstyle-xml',
135 + '//tools/build/conf:suppressions-xml',
136 + ],
135 labels = [ 'checkstyle' ], 137 labels = [ 'checkstyle' ],
136 ) 138 )
137 else: 139 else:
......