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
This commit is contained in:
Michael Pratt
2019-06-03 13:31:47 -07:00
committed by Shentubot
parent 4555f6adc8
commit 6e1f51f3eb
4 changed files with 0 additions and 119 deletions
-12
View File
@@ -417,12 +417,6 @@ syscall_test(
test = "//test/syscalls/linux:socket_stream_nonblock_local_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",
@@ -434,12 +428,6 @@ syscall_test(
test = "//test/syscalls/linux:socket_unix_dgram_non_blocking_test",
)
syscall_test(
size = "large",
shard_count = 10,
test = "//test/syscalls/linux:socket_unix_filesystem_test",
)
syscall_test(
size = "large",
shard_count = 10,
-33
View File
@@ -2613,22 +2613,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,
@@ -2671,23 +2655,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,
@@ -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
@@ -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