commit a23cde71ae4e8c30aa80559e77c95fa1fb5f57bf
author vladmos <vladmos@google.com> Thu Aug 24 16:54:57 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Thu Aug 24 17:43:26 2017 +0200
tree 2d026eafb606d3dad39beb9a5f8cb97ae54112ac
parent 01744244210ce2d4759cedbc2dc73855048e0a59

Replace deprecated `set` constructor and its order names in integration tests

The name `set` and order names "stable", "compile", "naive_link", and "link"
are deprecated and will soon be removed from Blaze.

PiperOrigin-RevId: 166341984

src/test/shell/bazel/bazel_java_test.sh

diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh
index a4f5db3..a12cab4 100755
--- a/src/test/shell/bazel/bazel_java_test.sh
+++ b/src/test/shell/bazel/bazel_java_test.sh
@@ -183,7 +183,7 @@
     host_javabase = ctx.attr._host_javabase
   )
   return struct(
-    files = set([output_jar]),
+    files = depset([output_jar]),
     providers = [compilation_provider]
   )
 
@@ -300,7 +300,7 @@
     host_javabase = ctx.attr._host_javabase
   )
   return struct(
-    files = set([output_jar]),
+    files = depset([output_jar]),
     providers = [compilation_provider]
   )
 
@@ -377,7 +377,7 @@
     host_javabase = ctx.attr._host_javabase
   )
   return struct(
-    files = set([output_jar]),
+    files = depset([output_jar]),
     providers = [compilation_provider]
   )
 

src/test/shell/integration/build_event_stream_test.sh

diff --git a/src/test/shell/integration/build_event_stream_test.sh b/src/test/shell/integration/build_event_stream_test.sh
index 18976a9..7672dfe 100755
--- a/src/test/shell/integration/build_event_stream_test.sh
+++ b/src/test/shell/integration/build_event_stream_test.sh
@@ -110,7 +110,7 @@
             output=aspect_out,
             content = "Hello from aspect")
     return struct(output_groups={
-        "aspect-out" : set([aspect_out]) })
+        "aspect-out" : depset([aspect_out]) })
 
 simple_aspect = aspect(implementation=_simple_aspect_impl)
 EOF
@@ -124,7 +124,7 @@
             command = "false",
         )
     return struct(output_groups={
-        "aspect-out" : set([aspect_out]) })
+        "aspect-out" : depset([aspect_out]) })
 
 failing_aspect = aspect(implementation=_failing_aspect_impl)
 EOF

src/test/shell/integration/discard_graph_edges_test.sh

diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh
index e6ce8c0..067f136 100755
--- a/src/test/shell/integration/discard_graph_edges_test.sh
+++ b/src/test/shell/integration/discard_graph_edges_test.sh
@@ -261,7 +261,7 @@
 
   cat > conflict/conflict_rule.bzl <<EOF || fail "Couldn't write bzl file"
 def _create(ctx):
-  files_to_build = set(ctx.outputs.outs)
+  files_to_build = depset(ctx.outputs.outs)
   intemediate_outputs = [ctx.actions.declare_file("bar")]
   intermediate_cmd = "cat %s > %s" % (ctx.attr.name, intemediate_outputs[0].path)
   action_cmd = "touch " + list(files_to_build)[0].path