mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-23 13:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

execve_test.com: fix run with landlock make. Cleanup execve/fexecve tests (#755)

Browse source
This commit is contained in:
Gavin Hayes 2023-03-02 01:32:15 -05:00 • committed by GitHub
parent ae365928c5
commit f5520209f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/libc/calls/execve_test.c
View file

@ -74,7 +74,7 @@ TEST(execve, ziposELF) {
} }
TEST(execve, ziposAPE) { TEST(execve, ziposAPE) {
if (!IsLinux()) { if (!IsLinux() && !IsFreebsd()) {
EXPECT_EQ(-1, execve("/zip/life-nomod.com", (char *const[]){0}, EXPECT_EQ(-1, execve("/zip/life-nomod.com", (char *const[]){0},
(char *const[]){0})); (char *const[]){0}));
return; return;

7
test/libc/calls/fexecve_test.c
View file

@ -95,7 +95,6 @@ TEST(fexecve, APE) {
SPAWN(fork); SPAWN(fork);
int fd = open("life-nomod.com", O_RDONLY); int fd = open("life-nomod.com", O_RDONLY);
ASSERT_NE(-1, fd); ASSERT_NE(-1, fd);
if (fd == -1 && errno == ENOSYS) _Exit(42);
fexecve(fd, (char *const[]){0}, (char *const[]){0}); fexecve(fd, (char *const[]){0}, (char *const[]){0});
EXITS(42); EXITS(42);
} }
@ -106,7 +105,6 @@ TEST(fexecve, APE_cloexec) {
SPAWN(fork); SPAWN(fork);
int fd = open("life-nomod.com", O_RDONLY | O_CLOEXEC); int fd = open("life-nomod.com", O_RDONLY | O_CLOEXEC);
ASSERT_NE(-1, fd); ASSERT_NE(-1, fd);
if (fd == -1 && errno == ENOSYS) _Exit(42);
fexecve(fd, (char *const[]){0}, (char *const[]){0}); fexecve(fd, (char *const[]){0}, (char *const[]){0});
EXITS(42); EXITS(42);
} }
@ -114,8 +112,8 @@ TEST(fexecve, APE_cloexec) {
TEST(fexecve, zipos) { TEST(fexecve, zipos) {
if (!IsLinux() && !IsFreebsd()) return; if (!IsLinux() && !IsFreebsd()) return;
int fd = open("/zip/life.elf", O_RDONLY); int fd = open("/zip/life.elf", O_RDONLY);
ASSERT_NE(-1, fd);
SPAWN(fork); SPAWN(fork);
if (fd == -1 && errno == ENOSYS) _Exit(42);
fexecve(fd, (char *const[]){0}, (char *const[]){0}); fexecve(fd, (char *const[]){0}, (char *const[]){0});
EXITS(42); EXITS(42);
close(fd); close(fd);
@ -124,9 +122,8 @@ TEST(fexecve, zipos) {
TEST(fexecve, ziposAPE) { TEST(fexecve, ziposAPE) {
if (!IsLinux() && !IsFreebsd()) return; if (!IsLinux() && !IsFreebsd()) return;
int fd = open("/zip/life-nomod.com", O_RDONLY); int fd = open("/zip/life-nomod.com", O_RDONLY);
SPAWN(fork);
ASSERT_NE(-1, fd); ASSERT_NE(-1, fd);
if (fd == -1 && errno == ENOSYS) _Exit(42); SPAWN(fork);
fexecve(fd, (char *const[]){0}, (char *const[]){0}); fexecve(fd, (char *const[]){0}, (char *const[]){0});
EXITS(42); EXITS(42);
close(fd); close(fd);

3
test/libc/calls/test.mk
View file

@ -131,6 +131,9 @@ o/$(MODE)/test/libc/calls/openbsd_test.com.runs: \
o/$(MODE)/test/libc/calls/fexecve_test.com.runs: \ o/$(MODE)/test/libc/calls/fexecve_test.com.runs: \
private .UNSANDBOXED = 1 # for memfd_create() private .UNSANDBOXED = 1 # for memfd_create()
o/$(MODE)/test/libc/calls/execve_test.com.runs: \
private .UNSANDBOXED = 1 # for memfd_create()
o/$(MODE)/test/libc/calls/read_test.com.runs: \ o/$(MODE)/test/libc/calls/read_test.com.runs: \
private .UNVEIL += /dev/zero private .UNVEIL += /dev/zero