summaryrefslogtreecommitdiffhomepage
path: root/test/syscalls
diff options
context:
space:
mode:
Diffstat (limited to 'test/syscalls')
-rw-r--r--test/syscalls/BUILD2
-rw-r--r--test/syscalls/linux/BUILD4
-rw-r--r--test/syscalls/linux/proc.cc4
-rw-r--r--test/syscalls/linux/proc_isolated.cc (renamed from test/syscalls/linux/proc_defaults.cc)2
-rw-r--r--test/syscalls/linux/socket_ipv4_datagram_based_socket_unbound_loopback.cc10
5 files changed, 11 insertions, 11 deletions
diff --git a/test/syscalls/BUILD b/test/syscalls/BUILD
index f75c85993..168766dd8 100644
--- a/test/syscalls/BUILD
+++ b/test/syscalls/BUILD
@@ -435,7 +435,7 @@ syscall_test(
syscall_test(
tags = ["container"],
- test = "//test/syscalls/linux:proc_defaults_test",
+ test = "//test/syscalls/linux:proc_isolated_test",
)
syscall_test(
diff --git a/test/syscalls/linux/BUILD b/test/syscalls/linux/BUILD
index a8915a743..5b882875f 100644
--- a/test/syscalls/linux/BUILD
+++ b/test/syscalls/linux/BUILD
@@ -1793,9 +1793,9 @@ cc_binary(
)
cc_binary(
- name = "proc_defaults_test",
+ name = "proc_isolated_test",
testonly = 1,
- srcs = ["proc_defaults.cc"],
+ srcs = ["proc_isolated.cc"],
linkstatic = 1,
deps = [
"@com_google_absl//absl/strings",
diff --git a/test/syscalls/linux/proc.cc b/test/syscalls/linux/proc.cc
index 19997f574..cb443163c 100644
--- a/test/syscalls/linux/proc.cc
+++ b/test/syscalls/linux/proc.cc
@@ -46,6 +46,8 @@
#include <utility>
#include <vector>
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
#include "absl/container/node_hash_set.h"
#include "absl/strings/ascii.h"
#include "absl/strings/match.h"
@@ -59,8 +61,6 @@
#include "absl/synchronization/notification.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
#include "test/util/capability_util.h"
#include "test/util/cleanup.h"
#include "test/util/file_descriptor.h"
diff --git a/test/syscalls/linux/proc_defaults.cc b/test/syscalls/linux/proc_isolated.cc
index 9b9a85efc..a38689667 100644
--- a/test/syscalls/linux/proc_defaults.cc
+++ b/test/syscalls/linux/proc_isolated.cc
@@ -15,9 +15,9 @@
#include <linux/sem.h>
#include <linux/shm.h>
+#include "gtest/gtest.h"
#include "absl/strings/numbers.h"
#include "absl/strings/str_split.h"
-#include "gtest/gtest.h"
#include "test/util/fs_util.h"
#include "test/util/test_util.h"
diff --git a/test/syscalls/linux/socket_ipv4_datagram_based_socket_unbound_loopback.cc b/test/syscalls/linux/socket_ipv4_datagram_based_socket_unbound_loopback.cc
index 9ae68e015..4ab4ef261 100644
--- a/test/syscalls/linux/socket_ipv4_datagram_based_socket_unbound_loopback.cc
+++ b/test/syscalls/linux/socket_ipv4_datagram_based_socket_unbound_loopback.cc
@@ -18,11 +18,11 @@
namespace gvisor {
namespace testing {
-INSTANTIATE_TEST_SUITE_P(IPv4Sockets, IPv4DatagramBasedUnboundSocketTest,
- ::testing::ValuesIn(ApplyVecToVec<SocketKind>(
- {IPv4UDPUnboundSocket, IPv4RawUDPUnboundSocket},
- AllBitwiseCombinations(List<int>{
- 0, SOCK_NONBLOCK}))));
+INSTANTIATE_TEST_SUITE_P(
+ IPv4Sockets, IPv4DatagramBasedUnboundSocketTest,
+ ::testing::ValuesIn(ApplyVecToVec<SocketKind>(
+ {IPv4UDPUnboundSocket, IPv4RawUDPUnboundSocket, ICMPUnboundSocket},
+ AllBitwiseCombinations(List<int>{0, SOCK_NONBLOCK}))));
} // namespace testing
} // namespace gvisor