mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-03-02 23:18:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix hermeticity issue with new test

Browse source
This commit is contained in:
Justine Tunney 2023-04-18 06:37:01 -07:00
parent 3e702e8f65
commit 4a6be2154d
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
4 changed files with 50 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
test/libc/stdio/system_test.c
View file

@ -156,34 +156,30 @@ TEST(system, kill) {
if (!IsWindows()) ASSERT_EQ(SIGTERM, WTERMSIG(ws));
}
// TODO(G4Vi): Please fix this regression?
// TEST(system, exitStatusPreservedAfterSemiColon) {
// ASSERT_EQ(1, WEXITSTATUS(system("false;")));
// ASSERT_EQ(1, WEXITSTATUS(system("false; ")));
// if (!IsWindows() && !IsMetal()) {
// ASSERT_EQ(1, WEXITSTATUS(system("/bin/false;")));
// ASSERT_EQ(1, WEXITSTATUS(system("/bin/false;")));
// }
// int pipefd[2];
// int stdoutBack = dup(1);
// ASSERT_NE(-1, stdoutBack);
// ASSERT_EQ(0, pipe(pipefd));
// ASSERT_NE(-1, dup2(pipefd[1], 1));
// ASSERT_EQ(0, WEXITSTATUS(system("false; echo $?")));
// char buf[3] = {0};
// ASSERT_EQ(2, read(pipefd[0], buf, 2));
// ASSERT_STREQ("1\n", buf);
// if (!IsWindows() && !IsMetal()) {
// ASSERT_EQ(0, WEXITSTATUS(system("/bin/false; echo $?")));
// buf[0] = 0;
// buf[1] = 0;
// ASSERT_EQ(2, read(pipefd[0], buf, 2));
// ASSERT_STREQ("1\n", buf);
// }
// ASSERT_NE(-1, dup2(stdoutBack, 1));
// ASSERT_EQ(0, close(pipefd[1]));
// ASSERT_EQ(0, close(pipefd[0]));
// }
TEST(system, exitStatusPreservedAfterSemiColon) {
testlib_extract("/zip/false.com", "false.com", 0755);
ASSERT_EQ(1, WEXITSTATUS(system("false;")));
ASSERT_EQ(1, WEXITSTATUS(system("false; ")));
ASSERT_EQ(1, WEXITSTATUS(system("./false.com;")));
ASSERT_EQ(1, WEXITSTATUS(system("./false.com;")));
int pipefd[2];
int stdoutBack = dup(1);
ASSERT_NE(-1, stdoutBack);
ASSERT_EQ(0, pipe(pipefd));
ASSERT_NE(-1, dup2(pipefd[1], 1));
ASSERT_EQ(0, WEXITSTATUS(system("false; echo $?")));
char buf[3] = {0};
ASSERT_EQ(2, read(pipefd[0], buf, 2));
ASSERT_STREQ("1\n", buf);
ASSERT_EQ(0, WEXITSTATUS(system("./false.com; echo $?")));
buf[0] = 0;
buf[1] = 0;
ASSERT_EQ(2, read(pipefd[0], buf, 2));
ASSERT_STREQ("1\n", buf);
ASSERT_NE(-1, dup2(stdoutBack, 1));
ASSERT_EQ(0, close(pipefd[1]));
ASSERT_EQ(0, close(pipefd[0]));
}
TEST(system, allowsLoneCloseCurlyBrace) {
int pipefd[2];

1
test/libc/stdio/test.mk
View file

@ -69,6 +69,7 @@ o/$(MODE)/test/libc/stdio/system_test.com.dbg: \
o/$(MODE)/test/libc/stdio/stdio.pkg \
o/$(MODE)/tool/build/echo.com.zip.o \
o/$(MODE)/tool/build/cocmd.com.zip.o \
o/$(MODE)/tool/build/false.com.zip.o \
$(LIBC_TESTMAIN) \
$(CRT) \
$(APE_NO_MODIFY_SELF)

3
tool/build/build.mk
View file

@ -16,6 +16,7 @@ TOOL_BUILD_BINS = \
o/$(MODE)/tool/build/cp \
o/$(MODE)/tool/build/mv \
o/$(MODE)/tool/build/echo \
o/$(MODE)/tool/build/false \
o/$(MODE)/tool/build/gzip \
o/$(MODE)/tool/build/printf \
o/$(MODE)/tool/build/dd
@ -110,6 +111,8 @@ o/$(MODE)/tool/build/mkdir.zip.o \
o/$(MODE)/tool/build/chmod.zip.o \
o/$(MODE)/tool/build/cp.zip.o \
o/$(MODE)/tool/build/mv.zip.o \
o/$(MODE)/tool/build/false.zip.o \
o/$(MODE)/tool/build/false.com.zip.o \
o/$(MODE)/tool/build/echo.zip.o \
o/$(MODE)/tool/build/echo.com.zip.o \
o/$(MODE)/tool/build/cocmd.com.zip.o \

22
tool/build/false.c Normal file
View file

@ -0,0 +1,22 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2023 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
int main(int argc, char *argv[]) {
return 1;
}