diff options
author | vladmos <vladmos@google.com> | 2018-06-01 04:51:21 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-01 04:52:44 -0700 |
commit | 20a042faa91acf8db78684de9f38c4e628d61dd6 (patch) | |
tree | c2fc5c6d30cb51cb3f6e30ed0fb2d25f5525585f /src/java_tools | |
parent | 2269ee2af91b7df13820381d61e8e4e26a257b3a (diff) |
Format all bzl files with buildifier
This CL aslo enables a presubmit check for correct formatting of all bzl files in //third_party/bazel.
PiperOrigin-RevId: 198857055
Diffstat (limited to 'src/java_tools')
-rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/build_defs.bzl | 32 | ||||
-rw-r--r-- | src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/tests.bzl | 120 |
2 files changed, 82 insertions, 70 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/build_defs.bzl b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/build_defs.bzl index 2bf8c78538..6f1016704f 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/build_defs.bzl +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/build_defs.bzl @@ -15,25 +15,27 @@ """Rules to make the default javacopts available as a Java API.""" def _default_javacopts(ctx): - javacopts = java_common.default_javac_opts( - ctx, java_toolchain_attr = "_java_toolchain") - ctx.template_action( - template = ctx.file.template, - output = ctx.outputs.out, - substitutions = { - "%javacopts%": '"%s"' % '", "'.join(javacopts), - } - ) + javacopts = java_common.default_javac_opts( + ctx, + java_toolchain_attr = "_java_toolchain", + ) + ctx.template_action( + template = ctx.file.template, + output = ctx.outputs.out, + substitutions = { + "%javacopts%": '"%s"' % '", "'.join(javacopts), + }, + ) default_javacopts = rule( - implementation=_default_javacopts, - attrs={ + implementation = _default_javacopts, + attrs = { "template": attr.label( - mandatory=True, - allow_files=True, - single_file=True, + mandatory = True, + allow_files = True, + single_file = True, ), - "out": attr.output(mandatory=True), + "out": attr.output(mandatory = True), "_java_toolchain": attr.label( default = Label("//tools/jdk:current_java_toolchain"), ), diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/tests.bzl b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/tests.bzl index e05e3bafea..452b138796 100644 --- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/tests.bzl +++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/tests.bzl @@ -11,66 +11,76 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -'''Helpers to create golden tests, to minimize code duplication.''' +"""Helpers to create golden tests, to minimize code duplication.""" -def create_golden_test(name, golden_output_file, golden_stderr_file, expect_errors, checking_mode, - has_bootclasspath, testdata_pkg, import_deps_checker, rt_jar, - missing_jar = None, replacing_jar = None, direct_jars = []): - '''Create a golden test for the dependency checker.''' - all_dep_jars = [ - "testdata_client", - "testdata_lib_Library", - "testdata_lib_LibraryAnnotations", - "testdata_lib_LibraryException", - "testdata_lib_LibraryInterface", - ] - client_jar = testdata_pkg + ":testdata_client" - data = [ - golden_output_file, - golden_stderr_file, - import_deps_checker, - rt_jar, - ] + [testdata_pkg + ":" + x for x in all_dep_jars] - if (replacing_jar): - data.append(testdata_pkg + ":" + replacing_jar) +def create_golden_test( + name, + golden_output_file, + golden_stderr_file, + expect_errors, + checking_mode, + has_bootclasspath, + testdata_pkg, + import_deps_checker, + rt_jar, + missing_jar = None, + replacing_jar = None, + direct_jars = []): + """Create a golden test for the dependency checker.""" + all_dep_jars = [ + "testdata_client", + "testdata_lib_Library", + "testdata_lib_LibraryAnnotations", + "testdata_lib_LibraryException", + "testdata_lib_LibraryInterface", + ] + client_jar = testdata_pkg + ":testdata_client" + data = [ + golden_output_file, + golden_stderr_file, + import_deps_checker, + rt_jar, + ] + [testdata_pkg + ":" + x for x in all_dep_jars] + if (replacing_jar): + data.append(testdata_pkg + ":" + replacing_jar) - args = [ - "$(location %s)" % golden_output_file, - "$(location %s)" % golden_stderr_file, - # The exit code 199 means the checker emits errors on dependency issues. - "199" if expect_errors else "0", - "$(location %s)" % import_deps_checker, - "--checking_mode=%s" % checking_mode, - ] - args.append("--bootclasspath_entry") - if has_bootclasspath: - args.append("$(location %s)" % rt_jar) - else: - args.append("$(location %s)" % client_jar) # Fake bootclasspath. + args = [ + "$(location %s)" % golden_output_file, + "$(location %s)" % golden_stderr_file, + # The exit code 199 means the checker emits errors on dependency issues. + "199" if expect_errors else "0", + "$(location %s)" % import_deps_checker, + "--checking_mode=%s" % checking_mode, + ] + args.append("--bootclasspath_entry") + if has_bootclasspath: + args.append("$(location %s)" % rt_jar) + else: + args.append("$(location %s)" % client_jar) # Fake bootclasspath. - for dep in all_dep_jars: - if dep == missing_jar: - if replacing_jar: + for dep in all_dep_jars: + if dep == missing_jar: + if replacing_jar: + args.append("--classpath_entry") + args.append("$(location %s:%s)" % (testdata_pkg, replacing_jar)) + continue args.append("--classpath_entry") - args.append("$(location %s:%s)" % (testdata_pkg, replacing_jar)) - continue - args.append("--classpath_entry") - args.append("$(location %s:%s)" % (testdata_pkg, dep)) + args.append("$(location %s:%s)" % (testdata_pkg, dep)) - for dep in direct_jars: - args.append("--directdep") - args.append("$(location %s:%s)" % (testdata_pkg, dep)) + for dep in direct_jars: + args.append("--directdep") + args.append("$(location %s:%s)" % (testdata_pkg, dep)) - args = args + [ - "--input", - "$(location %s:testdata_client)" % testdata_pkg, - ] + args = args + [ + "--input", + "$(location %s:testdata_client)" % testdata_pkg, + ] - args.append("--rule_label=:%s" % name) + args.append("--rule_label=:%s" % name) - native.sh_test( - name=name, - srcs = ["golden_test.sh"], - args = args, - data = data, - ) + native.sh_test( + name = name, + srcs = ["golden_test.sh"], + args = args, + data = data, + ) |