summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorMichael Pratt <mpratt@google.com>2019-06-03 13:30:51 -0700
committerShentubot <shentubot@google.com>2019-06-03 13:31:47 -0700
commit6e1f51f3eb44bdee85c50d075e750e857adef9fd (patch)
treebf05614450211491e927668b49914266b0bbd5eb /test
parent4555f6adc856b162ee46eff5e8c00c4beefa2f64 (diff)
Remove duplicate socket tests
socket_unix_abstract.cc: Subset of socket_abstract.cc socket_unix_filesystem.cc: Subset of socket_filesystem.cc PiperOrigin-RevId: 251297117
Diffstat (limited to 'test')
-rw-r--r--test/syscalls/BUILD12
-rw-r--r--test/syscalls/linux/BUILD33
-rw-r--r--test/syscalls/linux/socket_unix_abstract.cc37
-rw-r--r--test/syscalls/linux/socket_unix_filesystem.cc37
4 files changed, 0 insertions, 119 deletions
diff --git a/test/syscalls/BUILD b/test/syscalls/BUILD
index c53742d14..4ea4cee30 100644
--- a/test/syscalls/BUILD
+++ b/test/syscalls/BUILD
@@ -418,12 +418,6 @@ syscall_test(
)
syscall_test(
- size = "large",
- shard_count = 10,
- test = "//test/syscalls/linux:socket_unix_abstract_test",
-)
-
-syscall_test(
# NOTE(b/116636318): Large sendmsg may stall a long time.
size = "enormous",
test = "//test/syscalls/linux:socket_unix_dgram_local_test",
@@ -437,12 +431,6 @@ syscall_test(
syscall_test(
size = "large",
shard_count = 10,
- test = "//test/syscalls/linux:socket_unix_filesystem_test",
-)
-
-syscall_test(
- size = "large",
- shard_count = 10,
test = "//test/syscalls/linux:socket_unix_pair_test",
)
diff --git a/test/syscalls/linux/BUILD b/test/syscalls/linux/BUILD
index 8465e5ad0..ba9fd6d1f 100644
--- a/test/syscalls/linux/BUILD
+++ b/test/syscalls/linux/BUILD
@@ -2614,22 +2614,6 @@ cc_binary(
)
cc_binary(
- name = "socket_unix_abstract_test",
- testonly = 1,
- srcs = [
- "socket_unix_abstract.cc",
- ],
- linkstatic = 1,
- deps = [
- ":socket_test_util",
- ":socket_unix_test_cases",
- ":unix_domain_socket_test_util",
- "//test/util:test_main",
- "//test/util:test_util",
- ],
-)
-
-cc_binary(
name = "socket_unix_unbound_dgram_test",
testonly = 1,
srcs = ["socket_unix_unbound_dgram.cc"],
@@ -2672,23 +2656,6 @@ cc_binary(
)
cc_binary(
- name = "socket_unix_filesystem_test",
- testonly = 1,
- srcs = [
- "socket_unix_filesystem.cc",
- ],
- linkstatic = 1,
- deps = [
- ":socket_test_util",
- ":socket_unix_test_cases",
- ":unix_domain_socket_test_util",
- "//test/util:test_main",
- "//test/util:test_util",
- "@com_google_googletest//:gtest",
- ],
-)
-
-cc_binary(
name = "socket_blocking_local_test",
testonly = 1,
srcs = [
diff --git a/test/syscalls/linux/socket_unix_abstract.cc b/test/syscalls/linux/socket_unix_abstract.cc
deleted file mode 100644
index 8241bf997..000000000
--- a/test/syscalls/linux/socket_unix_abstract.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2018 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
-
-#include <vector>
-
-#include "test/syscalls/linux/socket_test_util.h"
-#include "test/syscalls/linux/socket_unix.h"
-#include "test/syscalls/linux/unix_domain_socket_test_util.h"
-#include "test/util/test_util.h"
-
-namespace gvisor {
-namespace testing {
-
-std::vector<SocketPairKind> GetSocketPairs() {
- return ApplyVec<SocketPairKind>(
- AbstractBoundUnixDomainSocketPair,
- AllBitwiseCombinations(List<int>{SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET},
- List<int>{0, SOCK_NONBLOCK}));
-}
-
-INSTANTIATE_TEST_SUITE_P(
- AllUnixDomainSockets, UnixSocketPairTest,
- ::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
-
-} // namespace testing
-} // namespace gvisor
diff --git a/test/syscalls/linux/socket_unix_filesystem.cc b/test/syscalls/linux/socket_unix_filesystem.cc
deleted file mode 100644
index 5dbe67773..000000000
--- a/test/syscalls/linux/socket_unix_filesystem.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2018 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
-
-#include <vector>
-
-#include "test/syscalls/linux/socket_test_util.h"
-#include "test/syscalls/linux/socket_unix.h"
-#include "test/syscalls/linux/unix_domain_socket_test_util.h"
-#include "test/util/test_util.h"
-
-namespace gvisor {
-namespace testing {
-
-std::vector<SocketPairKind> GetSocketPairs() {
- return ApplyVec<SocketPairKind>(
- FilesystemBoundUnixDomainSocketPair,
- AllBitwiseCombinations(List<int>{SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET},
- List<int>{0, SOCK_NONBLOCK}));
-}
-
-INSTANTIATE_TEST_SUITE_P(
- AllUnixDomainSockets, UnixSocketPairTest,
- ::testing::ValuesIn(IncludeReversals(GetSocketPairs())));
-
-} // namespace testing
-} // namespace gvisor