Update tests and source files to avoid depset union.
Progress towards https://github.com/bazelbuild/bazel/issues/5817
RELNOTES: None.
PiperOrigin-RevId: 245265538
diff --git a/src/test/shell/integration/discard_analysis_cache_test.sh b/src/test/shell/integration/discard_analysis_cache_test.sh
index 4c3cb9f..a066310 100755
--- a/src/test/shell/integration/discard_analysis_cache_test.sh
+++ b/src/test/shell/integration/discard_analysis_cache_test.sh
@@ -110,15 +110,16 @@
mkdir -p "foo" || fail "Couldn't make directory"
cat > foo/simpleaspect.bzl <<'EOF' || fail "Couldn't write bzl file"
def _simple_aspect_impl(target, ctx):
- result=depset()
+ result=[]
for orig_out in target.files:
aspect_out = ctx.actions.declare_file(orig_out.basename + ".aspect")
ctx.actions.write(
output=aspect_out,
content = "Hello from aspect for %s" % orig_out.basename)
result += [aspect_out]
- for src in ctx.rule.attr.srcs:
- result += src.aspectouts
+
+ result = depset(result,
+ transitive = [src.aspectouts for src in ctx.rule.attr.srcs])
return struct(output_groups={
"aspect-out" : result }, aspectouts = result)
diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh
index c8d62b1..ec7c43d 100755
--- a/src/test/shell/integration/discard_graph_edges_test.sh
+++ b/src/test/shell/integration/discard_graph_edges_test.sh
@@ -129,15 +129,16 @@
mkdir -p "foo" || fail "Couldn't make directory"
cat > foo/simpleaspect.bzl <<'EOF' || fail "Couldn't write bzl file"
def _simple_aspect_impl(target, ctx):
- result=depset()
+ result=[]
for orig_out in target.files:
aspect_out = ctx.actions.declare_file(orig_out.basename + ".aspect")
ctx.actions.write(
output=aspect_out,
content = "Hello from aspect for %s" % orig_out.basename)
result += [aspect_out]
- for src in ctx.rule.attr.srcs:
- result += src.aspectouts
+
+ result = depset(result,
+ transitive = [src.aspectouts for src in ctx.rule.attr.srcs])
return struct(output_groups={
"aspect-out" : result }, aspectouts = result)
diff --git a/tools/build_rules/java_rules_skylark.bzl b/tools/build_rules/java_rules_skylark.bzl
index f837fe4..5bc76a5 100644
--- a/tools/build_rules/java_rules_skylark.bzl
+++ b/tools/build_rules/java_rules_skylark.bzl
@@ -36,8 +36,8 @@
jars = ctx.files.jars
neverlink_jars = ctx.files.neverlink_jars
- compile_time_jars += jars + neverlink_jars
- runtime_jars += jars
+ compile_time_jars = depset(jars + neverlink_jars, transitive = [compile_time_jars])
+ runtime_jars = depset(jars, transitive = [runtime_jars])
compile_time_jars_list = compile_time_jars.to_list() # TODO: This is weird.
build_output = class_jar.path + ".build_output"
