From 9a8692c82ac543969cc0c9cf3541f2ab925ba4ac Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Sat, 3 Apr 2021 00:16:37 -0700
Subject: Remove eternal and enormous tests.

PiperOrigin-RevId: 366573366
---
 test/benchmarks/base/BUILD     | 3 ---
 test/benchmarks/database/BUILD | 1 -
 test/benchmarks/fs/BUILD       | 2 --
 test/benchmarks/media/BUILD    | 1 -
 test/benchmarks/ml/BUILD       | 1 -
 test/benchmarks/network/BUILD  | 5 -----
 test/perf/BUILD                | 8 ++++----
 test/runtimes/defs.bzl         | 1 -
 test/syscalls/BUILD            | 6 ++----
 9 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/test/benchmarks/base/BUILD b/test/benchmarks/base/BUILD
index 697ab5837..a5a3cf2c1 100644
--- a/test/benchmarks/base/BUILD
+++ b/test/benchmarks/base/BUILD
@@ -17,7 +17,6 @@ go_library(
 
 benchmark_test(
     name = "startup_test",
-    size = "enormous",
     srcs = ["startup_test.go"],
     visibility = ["//:sandbox"],
     deps = [
@@ -29,7 +28,6 @@ benchmark_test(
 
 benchmark_test(
     name = "size_test",
-    size = "enormous",
     srcs = ["size_test.go"],
     visibility = ["//:sandbox"],
     deps = [
@@ -42,7 +40,6 @@ benchmark_test(
 
 benchmark_test(
     name = "sysbench_test",
-    size = "enormous",
     srcs = ["sysbench_test.go"],
     visibility = ["//:sandbox"],
     deps = [
diff --git a/test/benchmarks/database/BUILD b/test/benchmarks/database/BUILD
index 0b1743603..fee2695ff 100644
--- a/test/benchmarks/database/BUILD
+++ b/test/benchmarks/database/BUILD
@@ -11,7 +11,6 @@ go_library(
 
 benchmark_test(
     name = "redis_test",
-    size = "enormous",
     srcs = ["redis_test.go"],
     library = ":database",
     visibility = ["//:sandbox"],
diff --git a/test/benchmarks/fs/BUILD b/test/benchmarks/fs/BUILD
index dc82e63b2..c2b981a07 100644
--- a/test/benchmarks/fs/BUILD
+++ b/test/benchmarks/fs/BUILD
@@ -4,7 +4,6 @@ package(licenses = ["notice"])
 
 benchmark_test(
     name = "bazel_test",
-    size = "enormous",
     srcs = ["bazel_test.go"],
     visibility = ["//:sandbox"],
     deps = [
@@ -18,7 +17,6 @@ benchmark_test(
 
 benchmark_test(
     name = "fio_test",
-    size = "enormous",
     srcs = ["fio_test.go"],
     visibility = ["//:sandbox"],
     deps = [
diff --git a/test/benchmarks/media/BUILD b/test/benchmarks/media/BUILD
index 380783f0b..ad2ef3a55 100644
--- a/test/benchmarks/media/BUILD
+++ b/test/benchmarks/media/BUILD
@@ -11,7 +11,6 @@ go_library(
 
 benchmark_test(
     name = "ffmpeg_test",
-    size = "enormous",
     srcs = ["ffmpeg_test.go"],
     library = ":media",
     visibility = ["//:sandbox"],
diff --git a/test/benchmarks/ml/BUILD b/test/benchmarks/ml/BUILD
index 3425b8dad..56a4d4f39 100644
--- a/test/benchmarks/ml/BUILD
+++ b/test/benchmarks/ml/BUILD
@@ -11,7 +11,6 @@ go_library(
 
 benchmark_test(
     name = "tensorflow_test",
-    size = "enormous",
     srcs = ["tensorflow_test.go"],
     library = ":ml",
     visibility = ["//:sandbox"],
diff --git a/test/benchmarks/network/BUILD b/test/benchmarks/network/BUILD
index 2741570f5..e047020bf 100644
--- a/test/benchmarks/network/BUILD
+++ b/test/benchmarks/network/BUILD
@@ -18,7 +18,6 @@ go_library(
 
 benchmark_test(
     name = "iperf_test",
-    size = "enormous",
     srcs = [
         "iperf_test.go",
     ],
@@ -34,7 +33,6 @@ benchmark_test(
 
 benchmark_test(
     name = "node_test",
-    size = "enormous",
     srcs = [
         "node_test.go",
     ],
@@ -49,7 +47,6 @@ benchmark_test(
 
 benchmark_test(
     name = "ruby_test",
-    size = "enormous",
     srcs = [
         "ruby_test.go",
     ],
@@ -64,7 +61,6 @@ benchmark_test(
 
 benchmark_test(
     name = "nginx_test",
-    size = "enormous",
     srcs = [
         "nginx_test.go",
     ],
@@ -79,7 +75,6 @@ benchmark_test(
 
 benchmark_test(
     name = "httpd_test",
-    size = "enormous",
     srcs = [
         "httpd_test.go",
     ],
diff --git a/test/perf/BUILD b/test/perf/BUILD
index ed899ac22..4b98eb365 100644
--- a/test/perf/BUILD
+++ b/test/perf/BUILD
@@ -35,7 +35,7 @@ syscall_test(
 )
 
 syscall_test(
-    size = "enormous",
+    size = "large",
     debug = False,
     tags = ["nogotsan"],
     test = "//test/perf/linux:getdents_benchmark",
@@ -48,7 +48,7 @@ syscall_test(
 )
 
 syscall_test(
-    size = "enormous",
+    size = "large",
     debug = False,
     tags = ["nogotsan"],
     test = "//test/perf/linux:gettid_benchmark",
@@ -106,7 +106,7 @@ syscall_test(
 )
 
 syscall_test(
-    size = "enormous",
+    size = "large",
     debug = False,
     test = "//test/perf/linux:signal_benchmark",
 )
@@ -124,7 +124,7 @@ syscall_test(
 )
 
 syscall_test(
-    size = "enormous",
+    size = "large",
     add_overlay = True,
     debug = False,
     test = "//test/perf/linux:unlink_benchmark",
diff --git a/test/runtimes/defs.bzl b/test/runtimes/defs.bzl
index 702522d86..2550b61a3 100644
--- a/test/runtimes/defs.bzl
+++ b/test/runtimes/defs.bzl
@@ -75,7 +75,6 @@ def runtime_test(name, **kwargs):
             "local",
             "manual",
         ],
-        size = "enormous",
         **kwargs
     )
 
diff --git a/test/syscalls/BUILD b/test/syscalls/BUILD
index 3bd93df70..3b3e9337c 100644
--- a/test/syscalls/BUILD
+++ b/test/syscalls/BUILD
@@ -772,8 +772,7 @@ syscall_test(
 )
 
 syscall_test(
-    # NOTE(b/116636318): Large sendmsg may stall a long time.
-    size = "enormous",
+    flaky = 1,  # NOTE(b/116636318): Large sendmsg may stall a long time.
     shard_count = more_shards,
     test = "//test/syscalls/linux:socket_unix_dgram_local_test",
 )
@@ -791,8 +790,7 @@ syscall_test(
 )
 
 syscall_test(
-    # NOTE(b/116636318): Large sendmsg may stall a long time.
-    size = "enormous",
+    flaky = 1,  # NOTE(b/116636318): Large sendmsg may stall a long time.
     shard_count = more_shards,
     test = "//test/syscalls/linux:socket_unix_seqpacket_local_test",
 )
-- 
cgit v1.2.3