summaryrefslogtreecommitdiffhomepage
path: root/test/syscalls/linux/vfork.cc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-01-21 16:32:49 -0800
committergVisor bot <gvisor-bot@google.com>2020-01-21 16:32:49 -0800
commit45a8edbd5ae6c836317923dc7d2b5baac9feea98 (patch)
treec8e011c89c1808fe2e520ee41c9bcb2af7911cd0 /test/syscalls/linux/vfork.cc
parentb3405a719cbb33dac2deced192209a5584e5e3d6 (diff)
parent200cf245c4ed43d8e2a37484cdbc36f5fbfa1ac9 (diff)
Merge pull request #1492 from majek:err_typo_in_netstack_tests
PiperOrigin-RevId: 290840370
Diffstat (limited to 'test/syscalls/linux/vfork.cc')
-rw-r--r--test/syscalls/linux/vfork.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/syscalls/linux/vfork.cc b/test/syscalls/linux/vfork.cc
index 0aaba482d..153b3bd69 100644
--- a/test/syscalls/linux/vfork.cc
+++ b/test/syscalls/linux/vfork.cc
@@ -51,7 +51,7 @@ constexpr absl::Duration kChildDelay = absl::Seconds(10);
// errno, so kChildExitCode is chosen to be an unlikely errno:
constexpr int kChildExitCode = 118; // ENOTNAM: Not a XENIX named type file
-int64_t MonotonicNow() {
+int64 MonotonicNow() {
struct timespec now;
TEST_PCHECK(clock_gettime(CLOCK_MONOTONIC, &now) == 0);
return now.tv_sec * 1000000000ll + now.tv_nsec;
@@ -62,7 +62,7 @@ TEST(VforkTest, ParentStopsUntilChildExits) {
// N.B. Run the test in a single-threaded subprocess because
// vfork is not safe in a multi-threaded process.
- const int64_t start = MonotonicNow();
+ const int64 start = MonotonicNow();
pid_t pid = vfork();
if (pid == 0) {
@@ -72,7 +72,7 @@ TEST(VforkTest, ParentStopsUntilChildExits) {
TEST_PCHECK_MSG(pid > 0, "vfork failed");
MaybeSave();
- const int64_t end = MonotonicNow();
+ const int64 end = MonotonicNow();
absl::Duration dur = absl::Nanoseconds(end - start);
@@ -92,7 +92,7 @@ TEST(VforkTest, ParentStopsUntilChildExecves_NoRandomSave) {
char* const* const child_argv = owned_child_argv.get();
const auto test = [&] {
- const int64_t start = MonotonicNow();
+ const int64 start = MonotonicNow();
pid_t pid = vfork();
if (pid == 0) {
@@ -104,7 +104,7 @@ TEST(VforkTest, ParentStopsUntilChildExecves_NoRandomSave) {
// since the test expects an upper bound on the time spent
// stopped.
int saved_errno = errno;
- const int64_t end = MonotonicNow();
+ const int64 end = MonotonicNow();
errno = saved_errno;
TEST_PCHECK_MSG(pid > 0, "vfork failed");
MaybeSave();
@@ -143,7 +143,7 @@ TEST(VforkTest, ExecedChildExitDoesntUnstopParent_NoRandomSave) {
// pid1 exec'd and is now sleeping.
SleepSafe(kChildDelay / 2);
- const int64_t start = MonotonicNow();
+ const int64 start = MonotonicNow();
pid_t pid2 = vfork();
if (pid2 == 0) {
@@ -153,7 +153,7 @@ TEST(VforkTest, ExecedChildExitDoesntUnstopParent_NoRandomSave) {
TEST_PCHECK_MSG(pid2 > 0, "vfork failed");
MaybeSave();
- const int64_t end = MonotonicNow();
+ const int64 end = MonotonicNow();
absl::Duration dur = absl::Nanoseconds(end - start);