Perform inconsequential code cleanup

test/libc/calls/raise_test.c

@@ -28,64 +28,26 @@
 #include "libc/testlib/testlib.h"
 #include "libc/thread/spawn.h"
 
-////////////////////////////////////////////////////////////////////////////////
-// SIGTRAP
-
-TEST(raise, trap_sysv) {
-  if (IsWindows()) return;
+TEST(raise, trap) {
   signal(SIGTRAP, SIG_DFL);
   SPAWN(fork);
   raise(SIGTRAP);
   TERMS(SIGTRAP);
 }
 
-TEST(raise, trap_windows) {
-  if (!IsWindows()) return;
-  signal(SIGTRAP, SIG_DFL);
-  SPAWN(fork);
-  raise(SIGTRAP);
-  EXITS(128 + SIGTRAP);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// SIGFPE
-
-TEST(raise, fpe_sysv) {
-  if (IsWindows()) return;
+TEST(raise, fpe) {
   signal(SIGFPE, SIG_DFL);
   SPAWN(fork);
   raise(SIGFPE);
   TERMS(SIGFPE);
 }
 
-TEST(raise, fpe_windows) {
-  if (!IsWindows()) return;
-  signal(SIGFPE, SIG_DFL);
-  SPAWN(fork);
-  raise(SIGFPE);
-  EXITS(128 + SIGFPE);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// SIGUSR1
-
-TEST(raise, usr1_sysv) {
-  if (IsWindows()) return;
+TEST(raise, usr1) {
   SPAWN(fork);
   raise(SIGUSR1);
   TERMS(SIGUSR1);
 }
 
-TEST(raise, usr1_windows) {
-  if (!IsWindows()) return;
-  SPAWN(fork);
-  raise(SIGUSR1);
-  EXITS(128 + SIGUSR1);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// THREADS
-
 int threadid;
 
 void WorkerQuit(int sig, siginfo_t *si, void *ctx) {

test/libc/dns/servicestxt_test.c

@@ -25,10 +25,10 @@
 │ OTHER DEALINGS IN THE SOFTWARE.                                              │
 │                                                                              │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/dns/servicestxt.h"
 #include "libc/calls/calls.h"
 #include "libc/dns/dns.h"
 #include "libc/dns/ent.h"
-#include "libc/dns/servicestxt.h"
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"
 
@@ -137,8 +137,8 @@ TEST(LookupServicesByName, GetPortWhenNameOrAlias) {
 
   localproto = proto2;
   ASSERT_EQ(-1, /* protocol is non-NULL/length must be nonzero */
-            LookupServicesByName("ssh", localproto, 0, name, sizeof(name),
-                                 "services"));
+            LookupServicesByName("ssh", localproto, sizeof(proto2), name,
+                                 sizeof(name), "services"));
   ASSERT_STREQ(proto2, "udp");
 
   localproto = proto1;

test/libc/runtime/abort_test.c

@@ -19,33 +19,20 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/sigaction.h"
 #include "libc/calls/struct/sigset.h"
-#include "libc/dce.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/sig.h"
 #include "libc/testlib/subprocess.h"
 #include "libc/testlib/testlib.h"
 
-TEST(abort, sysv) {
-  if (IsWindows()) return;
+TEST(abort, test) {
   SPAWN(fork);
   ASSERT_NE(SIG_ERR, signal(SIGABRT, SIG_DFL));
   abort();
   TERMS(SIGABRT);
 }
 
-TEST(abort, windows) {
-  if (!IsWindows()) return;
-  SPAWN(fork);
-  ASSERT_NE(SIG_ERR, signal(SIGABRT, SIG_DFL));
-  abort();
-  EXITS(128 + SIGABRT);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TEST(abort, blocked_stillTerminates_sysv) {
+TEST(abort, blocked_stillTerminates) {
   sigset_t ss;
-  if (IsWindows()) return;
   SPAWN(fork);
   ASSERT_NE(SIG_ERR, signal(SIGABRT, SIG_DFL));
   sigfillset(&ss);
@@ -54,52 +41,19 @@ TEST(abort, blocked_stillTerminates_sysv) {
   TERMS(SIGABRT);
 }
 
-TEST(abort, blocked_stillTerminates_windows) {
-  sigset_t ss;
-  if (!IsWindows()) return;
-  SPAWN(fork);
-  ASSERT_NE(SIG_ERR, signal(SIGABRT, SIG_DFL));
-  sigfillset(&ss);
-  sigprocmask(SIG_SETMASK, &ss, 0);
-  abort();
-  EXITS(128 + SIGABRT);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TEST(abort, ign_stillTerminates_sysv) {
-  if (IsWindows()) return;
+TEST(abort, ign_stillTerminates) {
   SPAWN(fork);
   ASSERT_NE(SIG_ERR, signal(SIGABRT, SIG_IGN));
   abort();
   TERMS(SIGABRT);
 }
 
-TEST(abort, ign_stillTerminates_windows) {
-  if (!IsWindows()) return;
-  SPAWN(fork);
-  ASSERT_NE(SIG_ERR, signal(SIGABRT, SIG_IGN));
-  abort();
-  EXITS(128 + SIGABRT);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 void Ignore(int sig) {
 }
 
-TEST(abort, handled_stillTerminates_sysv) {
-  if (IsWindows()) return;
+TEST(abort, handled_stillTerminates) {
   SPAWN(fork);
   ASSERT_NE(SIG_ERR, signal(SIGABRT, Ignore));
   abort();
   TERMS(SIGABRT);
 }
-
-TEST(abort, handled_stillTerminates_windows) {
-  if (!IsWindows()) return;
-  SPAWN(fork);
-  ASSERT_NE(SIG_ERR, signal(SIGABRT, Ignore));
-  abort();
-  EXITS(128 + SIGABRT);
-}

test/libc/str/strncat_test.c

@@ -0,0 +1,28 @@
+/*-*- 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.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/str/str.h"
+#include "libc/testlib/testlib.h"
+
+TEST(strncat, test) {
+  char buf[32] = "foo";
+  EXPECT_STREQ("foobar", strncat(buf, "bar", 3));
+  EXPECT_STREQ("foobarbar", strncat(buf, "bar", 10));
+  EXPECT_STREQ("foobarbarb", strncat(buf, "bar", 1));
+  EXPECT_STREQ("foobarbarb", strncat(buf, "", 1));
+}