summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorMichael Pratt <mpratt@google.com>2019-04-10 17:59:02 -0700
committerShentubot <shentubot@google.com>2019-04-10 18:00:18 -0700
commitcc48969bb72e3efdc22746c5e7463b79b1942c2b (patch)
tree8fe3c01ba81b042a8ab9d7b9751b3c0c59e03a75 /test
parentd93d19fd4eefdfd868919a73c9498e7da7eb9258 (diff)
Internal change
PiperOrigin-RevId: 242978508 Change-Id: I0ea59ac5ba1dd499e87c53f2e24709371048679b
Diffstat (limited to 'test')
-rw-r--r--test/syscalls/linux/32bit.cc4
-rw-r--r--test/syscalls/linux/exec_binary.cc10
2 files changed, 7 insertions, 7 deletions
diff --git a/test/syscalls/linux/32bit.cc b/test/syscalls/linux/32bit.cc
index b8d5f0355..230648c9b 100644
--- a/test/syscalls/linux/32bit.cc
+++ b/test/syscalls/linux/32bit.cc
@@ -84,8 +84,8 @@ TEST(Syscall32Bit, Int80) {
// disabled).
return;
case Platform::kPtrace:
- // TODO: The ptrace platform does not have a consistent story
- // here.
+ // TODO: The ptrace platform does not have a
+ // consistent story here.
return;
case Platform::kNative:
break;
diff --git a/test/syscalls/linux/exec_binary.cc b/test/syscalls/linux/exec_binary.cc
index cfc898699..cb5c7ae51 100644
--- a/test/syscalls/linux/exec_binary.cc
+++ b/test/syscalls/linux/exec_binary.cc
@@ -285,9 +285,9 @@ ElfBinary<64> StandardElf() {
elf.header.e_phoff = sizeof(elf.header);
elf.header.e_phentsize = sizeof(decltype(elf)::ElfPhdr);
- // TODO: Always include a PT_GNU_STACK segment to disable
- // executable stacks. With this omitted the stack (and all PROT_READ) mappings
- // should be executable, but gVisor doesn't support that.
+ // TODO: Always include a PT_GNU_STACK segment to
+ // disable executable stacks. With this omitted the stack (and all PROT_READ)
+ // mappings should be executable, but gVisor doesn't support that.
decltype(elf)::ElfPhdr phdr = {};
phdr.p_type = PT_GNU_STACK;
phdr.p_flags = PF_R | PF_W;
@@ -1005,8 +1005,8 @@ TEST(ElfTest, NoExecute) {
// Execute, but no read permissions on the binary works just fine.
TEST(ElfTest, NoRead) {
- // TODO: gVisor's backing filesystem may prevent the sentry from
- // reading the executable.
+ // TODO: gVisor's backing filesystem may prevent the
+ // sentry from reading the executable.
SKIP_IF(IsRunningOnGvisor());
ElfBinary<64> elf = StandardElf();