홍길동 / 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(
### Checkstyle
if srcs:
chk_cmd = '#!/bin/bash\n'
# FIXME hack to add dependency on suppressions-xml in the checkstyle rule
chk_cmd += 'FOO="$(location //tools/build/conf:suppressions-xml)"\n'
base = get_base_path()
chk_cmd += ' '.join(( 'java -jar $(location //lib:checkstyle)',
'-c $(location //tools/build/conf:checkstyle-xml)',
......@@ -131,7 +129,11 @@ def osgi_jar(
sh_test(
name = name + '-checkstyle',
test = ':' + name + '-checkstyle-sh',
deps = [ ':'+ bare_jar_name ],
deps = [ ':'+ bare_jar_name,
'//lib:checkstyle',
'//tools/build/conf:checkstyle-xml',
'//tools/build/conf:suppressions-xml',
],
labels = [ 'checkstyle' ],
)
else:
......