summaryrefslogtreecommitdiffhomepage
path: root/test/syscalls/linux
diff options
context:
space:
mode:
authorZach Koopmans <zkoopmans@google.com>2021-06-11 20:30:41 -0700
committergVisor bot <gvisor-bot@google.com>2021-06-11 20:33:58 -0700
commitb92e8ee8d6744d81383f4265faa008ccce894f5e (patch)
tree6b1d0d398fe3c0464d39a5a32c5444a7d218f932 /test/syscalls/linux
parentec6a7ebc75f714e9ac8ae1dc785304661f6e63b4 (diff)
Fix //test/syscalls:exec_test_native
Later kernels add empty arguments to argv, throwing off return values for the exec_basic_workload.cc binary. This is result of a bug introduced by ccbb18b67323b "exec/binfmt_script: Don't modify bprm->buf and then return - ENOEXEC". Before this change, an empty interpreter string was reported if the first non-space/non-tab character after "#!" was '\0' (end of file, previously- overwritten trailing space or tab, or previously-overwritten first newline). After this change, an empty interpreter string is reported if all characters after "#!" are spaces or tabs, or the first non-space non-tab character is at i_end, which is the position of the first newline after "#!". However, if there is no newline after "#!" (as in ExecTest.InterpreterScriptNoPath), then i_end = buf_end (= bprm->buf + sizeof(bprm->buf) - 1, the last possible byte in the buffer) and neither condition holds. Change white space for script inputs to take into account the above bug. Co-authored-by: Andrei Vagin <avagin@gmail.com> PiperOrigin-RevId: 378997171
Diffstat (limited to 'test/syscalls/linux')
-rw-r--r--test/syscalls/linux/exec.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/test/syscalls/linux/exec.cc b/test/syscalls/linux/exec.cc
index e0f3779a2..4df429ed8 100644
--- a/test/syscalls/linux/exec.cc
+++ b/test/syscalls/linux/exec.cc
@@ -278,15 +278,12 @@ TEST(ExecTest, InterpreterScriptArgNUL) {
// Trailing whitespace following interpreter path is ignored.
TEST(ExecTest, InterpreterScriptTrailingWhitespace) {
- // FIXME(b/190850365): This test case fails on Linux.
- SKIP_IF(!IsRunningOnGvisor());
-
// Symlink through /tmp to ensure the path is short enough.
TempPath link = ASSERT_NO_ERRNO_AND_VALUE(
TempPath::CreateSymlinkTo("/tmp", RunfilePath(kBasicWorkload)));
TempPath script = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateFileWith(
- GetAbsoluteTestTmpdir(), absl::StrCat("#!", link.path(), " "), 0755));
+ GetAbsoluteTestTmpdir(), absl::StrCat("#!", link.path(), " \n"), 0755));
CheckExec(script.path(), {script.path()}, {}, ArgEnvExitStatus(1, 0),
absl::StrCat(link.path(), "\n", script.path(), "\n"));
@@ -306,11 +303,11 @@ TEST(ExecTest, InterpreterScriptArgWhitespace) {
}
TEST(ExecTest, InterpreterScriptNoPath) {
- // FIXME(b/190850365): This test case fails on Linux.
- SKIP_IF(!IsRunningOnGvisor());
-
TempPath script = ASSERT_NO_ERRNO_AND_VALUE(
- TempPath::CreateFileWith(GetAbsoluteTestTmpdir(), "#!", 0755));
+ TempPath::CreateFileWith(GetAbsoluteTestTmpdir(), "#!\n\n", 0755));
+
+ std::cerr << "path: " << script.path() << std::endl;
+ std::cerr << system(absl::StrCat("cat ", script.path()).c_str()) << std::endl;
int execve_errno;
ASSERT_NO_ERRNO_AND_VALUE(