From 536dfb947a51e41dbd519b18291a9c7ab3c73313 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Mon, 4 Dec 2023 23:19:28 -0800 Subject: [PATCH] Make getprogramexecutablename_test report status Fixes #988 --- test/libc/calls/getprogramexecutablename_test.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/libc/calls/getprogramexecutablename_test.c b/test/libc/calls/getprogramexecutablename_test.c index 3a4891c8b..7653f8cf4 100644 --- a/test/libc/calls/getprogramexecutablename_test.c +++ b/test/libc/calls/getprogramexecutablename_test.c @@ -47,26 +47,26 @@ __attribute__((__constructor__)) static void Child(int argc, char *argv[]) { if (argc >= 2 && !strcmp(argv[1], "Child")) { ASSERT_EQ(3, argc); EXPECT_STREQ(argv[2], GetProgramExecutableName()); - exit(0); + exit(g_testlib_failed); } } TEST(GetProgramExecutableName, ofThisFile) { EXPECT_EQ('/', *self); EXPECT_TRUE( - endswith(self, "test/libc/calls/getprogramexecutablename_test.com")); + endswith(self, "test/libc/calls/getprogramexecutablename_test.com")); } TEST(GetProgramExecutableName, nullEnv) { SPAWN(fork); - execve(self, (char *[]){self, "Child", self, 0}, (char *[]){ 0 }); + execve(self, (char *[]){self, "Child", self, 0}, (char *[]){0}); abort(); EXITS(0); } TEST(GetProramExecutableName, weirdArgv0NullEnv) { SPAWN(fork); - execve(self, (char *[]){"hello", "Child", self, 0}, (char *[]){ 0 }); + execve(self, (char *[]){"hello", "Child", self, 0}, (char *[]){0}); abort(); EXITS(0); } @@ -76,7 +76,7 @@ TEST(GetProgramExecutableName, weirdArgv0CosmoVar) { char buf[32 + PATH_MAX]; stpcpy(stpcpy(buf, "COSMOPOLITAN_PROGRAM_EXECUTABLE="), self); SPAWN(fork); - execve(self, (char *[]){"hello", "Child", self, 0}, (char *[]){ buf, 0}); + execve(self, (char *[]){"hello", "Child", self, 0}, (char *[]){buf, 0}); abort(); EXITS(0); } @@ -85,7 +85,7 @@ TEST(GetProgramExecutableName, weirdArgv0WrongCosmoVar) { if (skipcosmotests) return; char *bad = "COSMOPOLITAN_PROGRAM_EXECUTABLE=hi"; SPAWN(fork); - execve(self, (char *[]){"hello", "Child", self, 0}, (char *[]){ bad, 0}); + execve(self, (char *[]){"hello", "Child", self, 0}, (char *[]){bad, 0}); abort(); EXITS(0); } @@ -104,7 +104,7 @@ TEST(GetProgramExecutableName, movedSelf) { ASSERT_NE(NULL, getcwd(buf, BUFSIZ - 5)); stpcpy(buf + strlen(buf), "/test"); SPAWN(fork); - execve(buf, (char *[]){"hello", "Child", buf, 0}, (char *[]){ 0 }); + execve(buf, (char *[]){"hello", "Child", buf, 0}, (char *[]){0}); abort(); EXITS(0); }