Internal change

PiperOrigin-RevId: 341732791

4 files changed, 3 insertions, 14 deletions

diff --git a/test/runner/defs.bzl b/test/runner/defs.bzl
index 4992147d4..7618f6a21 100644
--- a/test/runner/defs.bzl
+++ b/test/runner/defs.bzl
@@ -1,6 +1,6 @@
 """Defines a rule for syscall test targets."""
 
-load("//tools:defs.bzl", "default_platform", "loopback", "platforms")
+load("//tools:defs.bzl", "default_platform", "platforms")
 
 def _runner_test_impl(ctx):
     # Generate a runner binary.
@@ -100,6 +100,7 @@ def _syscall_test(
 
     # Disable off-host networking.
     tags.append("requires-net:loopback")
+    tags.append("requires-net:ipv4")
     tags.append("block-network")
 
     # gotsan makes sense only if tests are running in gVisor.
@@ -125,7 +126,6 @@ def _syscall_test(
         name = name,
         test = test,
         runner_args = runner_args,
-        data = [loopback],
         size = size,
         tags = tags,
         shard_count = shard_count,
diff --git a/tools/bazeldefs/BUILD b/tools/bazeldefs/BUILD
index d043caf06..27e85a75e 100644
--- a/tools/bazeldefs/BUILD
+++ b/tools/bazeldefs/BUILD
@@ -2,15 +2,6 @@ load("//tools:defs.bzl", "bzl_library", "rbe_platform", "rbe_toolchain")
 
 package(licenses = ["notice"])
 
-# In bazel, no special support is required for loopback networking. This is
-# just a dummy data target that does not change the test environment.
-genrule(
-    name = "loopback",
-    outs = ["loopback.txt"],
-    cmd = "touch $@",
-    visibility = ["//:sandbox"],
-)
-
 # We need to define a bazel platform and toolchain to specify dockerPrivileged
 # and dockerRunAsRoot options, they are required to run tests on the RBE
 # cluster in Kokoro.
diff --git a/tools/bazeldefs/defs.bzl b/tools/bazeldefs/defs.bzl
index ba186aace..c2f94bb9c 100644
--- a/tools/bazeldefs/defs.bzl
+++ b/tools/bazeldefs/defs.bzl
@@ -5,7 +5,6 @@ load("@bazel_skylib//:bzl_library.bzl", _bzl_library = "bzl_library")
 
 build_test = _build_test
 bzl_library = _bzl_library
-loopback = "//tools/bazeldefs:loopback"
 rbe_platform = native.platform
 rbe_toolchain = native.toolchain
 
diff --git a/tools/defs.bzl b/tools/defs.bzl
index d75e40863..2c8129e7e 100644
--- a/tools/defs.bzl
+++ b/tools/defs.bzl
@@ -8,7 +8,7 @@ change for Google-internal and bazel-compatible rules.
 load("//tools/go_stateify:defs.bzl", "go_stateify")
 load("//tools/go_marshal:defs.bzl", "go_marshal", "marshal_deps", "marshal_test_deps")
 load("//tools/nogo:defs.bzl", "nogo_test")
-load("//tools/bazeldefs:defs.bzl", _build_test = "build_test", _bzl_library = "bzl_library", _coreutil = "coreutil", _default_installer = "default_installer", _default_net_util = "default_net_util", _loopback = "loopback", _proto_library = "proto_library", _rbe_platform = "rbe_platform", _rbe_toolchain = "rbe_toolchain", _select_arch = "select_arch", _select_system = "select_system", _short_path = "short_path")
+load("//tools/bazeldefs:defs.bzl", _build_test = "build_test", _bzl_library = "bzl_library", _coreutil = "coreutil", _default_installer = "default_installer", _default_net_util = "default_net_util", _proto_library = "proto_library", _rbe_platform = "rbe_platform", _rbe_toolchain = "rbe_toolchain", _select_arch = "select_arch", _select_system = "select_system", _short_path = "short_path")
 load("//tools/bazeldefs:cc.bzl", _cc_binary = "cc_binary", _cc_flags_supplier = "cc_flags_supplier", _cc_grpc_library = "cc_grpc_library", _cc_library = "cc_library", _cc_proto_library = "cc_proto_library", _cc_test = "cc_test", _cc_toolchain = "cc_toolchain", _gbenchmark = "gbenchmark", _grpcpp = "grpcpp", _gtest = "gtest", _vdso_linker_option = "vdso_linker_option")
 load("//tools/bazeldefs:go.bzl", _gazelle = "gazelle", _go_binary = "go_binary", _go_embed_data = "go_embed_data", _go_grpc_and_proto_libraries = "go_grpc_and_proto_libraries", _go_library = "go_library", _go_path = "go_path", _go_proto_library = "go_proto_library", _go_test = "go_test", _select_goarch = "select_goarch", _select_goos = "select_goos")
 load("//tools/bazeldefs:pkg.bzl", _pkg_deb = "pkg_deb", _pkg_tar = "pkg_tar")
@@ -20,7 +20,6 @@ build_test = _build_test
 bzl_library = _bzl_library
 default_installer = _default_installer
 default_net_util = _default_net_util
-loopback = _loopback
 select_arch = _select_arch
 select_system = _select_system
 short_path = _short_path