Delete LIBC_CALLS_HEFTY

- fork() no longer requires malloc()
- readdir() moved to LIBC_STDIO
- Custom APIs moved to LIBC_X

test/libc/calls/mkntenvblock_test.c

@@ -24,13 +24,13 @@ char16_t envvars[ARG_MAX];
 
 TEST(mkntenvblock, emptyList_onlyOutputsDoubleNulStringTerminator) {
   char *envp[] = {NULL};
-  ASSERT_NE(-1, mkntenvblock(envvars, envp));
+  ASSERT_NE(-1, mkntenvblock(envvars, envp, NULL));
   ASSERT_BINEQ(u"  ", envvars);
 }
 
 TEST(mkntenvblock, envp_becomesSortedDoubleNulTerminatedUtf16String) {
   char *envp[] = {"u=b", "c=d", "韩=非", "uh=d", "hduc=d", NULL};
-  ASSERT_NE(-1, mkntenvblock(envvars, envp));
+  ASSERT_NE(-1, mkntenvblock(envvars, envp, NULL));
   ASSERT_BINEQ(u"c = d   "
                u"h d u c = d   "
                u"u = b   "
@@ -39,3 +39,16 @@ TEST(mkntenvblock, envp_becomesSortedDoubleNulTerminatedUtf16String) {
                u"  ",
                envvars);
 }
+
+TEST(mkntenvblock, extraVar_getsAdded) {
+  char *envp[] = {"u=b", "c=d", "韩=非", "uh=d", "hduc=d", NULL};
+  ASSERT_NE(-1, mkntenvblock(envvars, envp, "a=a"));
+  ASSERT_BINEQ(u"a = a   "
+               u"c = d   "
+               u"h d u c = d   "
+               u"u = b   "
+               u"u h = d   "
+               u"Θù= ^ù  "
+               u"  ",
+               envvars);
+}

test/libc/calls/test.mk

@@ -4,8 +4,7 @@
 PKGS += TEST_LIBC_CALLS
 
 TEST_LIBC_CALLS_SRCS :=					\
-	$(wildcard test/libc/calls/*.c)			\
-	$(wildcard test/libc/calls/hefty/*.c)
+	$(wildcard test/libc/calls/*.c)
 TEST_LIBC_CALLS_SRCS_TEST = $(filter %_test.c,$(TEST_LIBC_CALLS_SRCS))
 
 TEST_LIBC_CALLS_OBJS =					\
@@ -26,13 +25,13 @@ TEST_LIBC_CALLS_CHECKS =				\
 
 TEST_LIBC_CALLS_DIRECTDEPS =				\
 	LIBC_CALLS					\
-	LIBC_CALLS_HEFTY				\
 	LIBC_FMT					\
 	LIBC_INTRIN					\
 	LIBC_LOG					\
 	LIBC_MEM					\
 	LIBC_NEXGEN32E					\
 	LIBC_RAND					\
+	LIBC_STDIO					\
 	LIBC_RUNTIME					\
 	LIBC_STR					\
 	LIBC_STUBS					\

test/libc/stdio/test.mk

@@ -29,6 +29,7 @@ TEST_LIBC_STDIO_DIRECTDEPS =				\
 	LIBC_INTRIN					\
 	LIBC_MEM					\
 	LIBC_NEXGEN32E					\
+	LIBC_RAND					\
 	LIBC_RUNTIME					\
 	LIBC_STDIO					\
 	LIBC_STR					\