mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-03-13 12:26:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

simplify execve_test support checking

Browse source
This commit is contained in:
Gavin Hayes 2023-12-06 03:02:35 -05:00
parent 893edc8983
commit 2df75e902b
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
test/libc/proc/execve_test.c
View file

@ -40,7 +40,7 @@ __static_yoink("zipos");
int fds[2]; int fds[2];
char buf[8]; char buf[8];
bool HasProcFSAndMemfd = false; bool SupportsFexecve = false;
void SetUpOnce(void) { void SetUpOnce(void) {
testlib_enable_tmp_setup_teardown(); testlib_enable_tmp_setup_teardown();
} }
@ -54,18 +54,18 @@ void GenBuf(char buf[8], int x) {
} }
} }
__attribute__((__constructor__)) static void init(void) { void SetUp(void) {
char buf[8]; char buf[8];
if (__argc == 4 && !strcmp(__argv[1], "-")) { if (__argc == 4 && !strcmp(__argv[1], "-")) {
GenBuf(buf, atoi(__argv[2])); GenBuf(buf, atoi(__argv[2]));
ASSERT_STREQ(buf, __argv[3]); ASSERT_STREQ(buf, __argv[3]);
exit(0); exit(0);
} }
// zipos execve requires /proc and memfd_create
// TODO check for memfd
if (IsLinux()) { if (IsLinux()) {
if (!__is_linux_2_6_23()) return;
// TODO check for memfd
struct stat st; struct stat st;
HasProcFSAndMemfd = stat("/proc/self/fd", &st) == 0 && S_ISDIR(st.st_mode); SupportsFexecve = stat("/proc/self/fd", &st) == 0 && S_ISDIR(st.st_mode);
} }
} }
@ -104,10 +104,8 @@ TEST(execve, elfIsUnreadable_mayBeExecuted) {
} }
TEST(execve, ziposELF) { TEST(execve, ziposELF) {
if (IsFreebsd()) return; // TODO: fixme on freebsd if (IsWindows()) return;
if (IsLinux() && !__is_linux_2_6_23()) return; // TODO: fixme on old linux if (!SupportsFexecve) {
if (IsLinux() && !HasProcFSAndMemfd) return;
if (!IsLinux() && !IsFreebsd()) {
EXPECT_SYS(ENOSYS, -1, EXPECT_SYS(ENOSYS, -1,
execve("/zip/life.elf", (char *const[]){0}, (char *const[]){0})); execve("/zip/life.elf", (char *const[]){0}, (char *const[]){0}));
return; return;
@ -119,10 +117,7 @@ TEST(execve, ziposELF) {
} }
TEST(execve, ziposAPE) { TEST(execve, ziposAPE) {
if (IsFreebsd()) return; // TODO: fixme on freebsd if (!SupportsFexecve) {
if (IsLinux() && !__is_linux_2_6_23()) return; // TODO: fixme on old linux
if (IsLinux() && !HasProcFSAndMemfd) return;
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;