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

Fold LIBC_UNICODE into LIBC_STR

Browse source
This commit is contained in:
Justine Tunney 2022-08-13 08:42:32 -07:00
parent 17aea99bb3
commit 367d06d9e4
173 changed files with 170 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@ TEST_LIBC_CALLS_DIRECTDEPS = \
LIBC_THREAD \
LIBC_TIME \
LIBC_TESTLIB \
LIBC_UNICODE \
LIBC_X \
LIBC_ZIPOS \
THIRD_PARTY_XED

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

@ -30,7 +30,6 @@ TEST_LIBC_FMT_DIRECTDEPS = \
LIBC_SYSV \
LIBC_TESTLIB \
LIBC_TINYMATH \
LIBC_UNICODE \
LIBC_X \
THIRD_PARTY_GDTOA

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

@ -37,7 +37,6 @@ TEST_LIBC_INTRIN_DIRECTDEPS = \
LIBC_THREAD \
LIBC_TESTLIB \
LIBC_TINYMATH \
LIBC_UNICODE \
LIBC_X \
TOOL_VIZ_LIB \
THIRD_PARTY_COMPILER_RT

2
test/libc/nexgen32e/kcp437_test.c
View file

@ -19,7 +19,7 @@
#include "libc/nexgen32e/nexgen32e.h"
#include "libc/str/str.h"
#include "libc/testlib/testlib.h"
#include "libc/unicode/unicode.h"
#include "libc/str/unicode.h"
TEST(kcp437, test) {
long i;

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

@ -37,7 +37,6 @@ TEST_LIBC_NEXGEN32E_DIRECTDEPS = \
LIBC_STUBS \
LIBC_SYSV \
LIBC_TESTLIB \
LIBC_UNICODE \
LIBC_X \
TOOL_VIZ_LIB \
THIRD_PARTY_XED

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

@ -37,7 +37,6 @@ TEST_LIBC_RUNTIME_DIRECTDEPS = \
LIBC_THREAD \
LIBC_TESTLIB \
LIBC_TINYMATH \
LIBC_UNICODE \
LIBC_X \
LIBC_ZIPOS \
TOOL_BUILD_LIB \

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

@ -38,7 +38,6 @@ TEST_LIBC_STDIO_DIRECTDEPS = \
LIBC_THREAD \
LIBC_TIME \
LIBC_LOG \
LIBC_UNICODE \
LIBC_X \
LIBC_ZIPOS \
THIRD_PARTY_GDTOA \

2
test/libc/str/pututf16_test.c
View file

@ -22,7 +22,7 @@
#include "libc/str/oldutf16.internal.h"
#include "libc/str/str.h"
#include "libc/testlib/testlib.h"
#include "libc/unicode/unicode.h"
#include "libc/str/unicode.h"
unsigned n;
size_t size;

2
test/libc/unicode/strnwidth_test.c → test/libc/str/strnwidth_test.c
View file

@ -20,7 +20,7 @@
#include "libc/testlib/ezbench.h"
#include "libc/testlib/hyperion.h"
#include "libc/testlib/testlib.h"
#include "libc/unicode/unicode.h"
#include "libc/str/unicode.h"
TEST(strwidth, test) {
EXPECT_EQ(5, strwidth("hello", 0));

15
test/libc/str/test.mk
View file

@ -45,7 +45,6 @@ TEST_LIBC_STR_DIRECTDEPS = \
LIBC_SYSV \
LIBC_SYSV_CALLS \
LIBC_TESTLIB \
LIBC_UNICODE \
LIBC_X \
LIBC_ZIPOS \
THIRD_PARTY_MBEDTLS \
@ -74,19 +73,9 @@ o/$(MODE)/test/libc/str/%.com.dbg: \
$(APE_NO_MODIFY_SELF)
@$(APELINK)
o/$(MODE)/test/libc/str/blake2.com.dbg: \
$(TEST_LIBC_STR_DEPS) \
o/$(MODE)/test/libc/str/blake2.o \
o/$(MODE)/test/libc/str/blake2b256_tests.txt.zip.o \
o/$(MODE)/test/libc/str/str.pkg \
$(LIBC_TESTMAIN) \
$(CRT) \
$(APE_NO_MODIFY_SELF)
@$(APELINK)
$(TEST_LIBC_STR_OBJS): private \
DEFAULT_CCFLAGS += \
-fno-builtin
DEFAULT_CCFLAGS += \
-fno-builtin
o/$(MODE)/test/libc/str/memmove_test.o: private \
OVERRIDE_CFLAGS += \

2
test/libc/unicode/wcwidth_test.c → test/libc/str/wcwidth_test.c
View file

@ -20,7 +20,7 @@
#include "libc/str/str.h"
#include "libc/testlib/ezbench.h"
#include "libc/testlib/testlib.h"
#include "libc/unicode/unicode.h"
#include "libc/str/unicode.h"
TEST(wcwidth, test) {
ASSERT_EQ(0, wcwidth(0));

1
test/libc/test.mk
View file

@ -18,6 +18,5 @@ o/$(MODE)/test/libc: \
o/$(MODE)/test/libc/thread \
o/$(MODE)/test/libc/time \
o/$(MODE)/test/libc/tinymath \
o/$(MODE)/test/libc/unicode \
o/$(MODE)/test/libc/x \
o/$(MODE)/test/libc/xed

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

@ -35,7 +35,6 @@ TEST_LIBC_TINYMATH_DIRECTDEPS = \
LIBC_SYSV \
LIBC_TESTLIB \
LIBC_TINYMATH \
LIBC_UNICODE \
LIBC_X \
THIRD_PARTY_GDTOA \
THIRD_PARTY_DOUBLECONVERSION

56
test/libc/unicode/test.mk
View file

@ -1,56 +0,0 @@
#-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
PKGS += TEST_LIBC_UNICODE
TEST_LIBC_UNICODE_SRCS := $(wildcard test/libc/unicode/*.c)
TEST_LIBC_UNICODE_SRCS_TEST = $(filter %_test.c,$(TEST_LIBC_UNICODE_SRCS))
TEST_LIBC_UNICODE_OBJS = \
$(TEST_LIBC_UNICODE_SRCS:%.c=o/$(MODE)/%.o)
TEST_LIBC_UNICODE_COMS = \
$(TEST_LIBC_UNICODE_SRCS:%.c=o/$(MODE)/%.com)
TEST_LIBC_UNICODE_BINS = \
$(TEST_LIBC_UNICODE_COMS) \
$(TEST_LIBC_UNICODE_COMS:%=%.dbg)
TEST_LIBC_UNICODE_TESTS = \
$(TEST_LIBC_UNICODE_SRCS_TEST:%.c=o/$(MODE)/%.com.ok)
TEST_LIBC_UNICODE_CHECKS = \
$(TEST_LIBC_UNICODE_SRCS_TEST:%.c=o/$(MODE)/%.com.runs)
TEST_LIBC_UNICODE_DIRECTDEPS = \
LIBC_CALLS \
LIBC_INTRIN \
LIBC_MEM \
LIBC_NEXGEN32E \
LIBC_LOG \
LIBC_STR \
LIBC_STUBS \
LIBC_TESTLIB \
LIBC_SYSV \
LIBC_UNICODE
TEST_LIBC_UNICODE_DEPS := \
$(call uniq,$(foreach x,$(TEST_LIBC_UNICODE_DIRECTDEPS),$($(x))))
o/$(MODE)/test/libc/unicode/unicode.pkg: \
$(TEST_LIBC_UNICODE_OBJS) \
$(foreach x,$(TEST_LIBC_UNICODE_DIRECTDEPS),$($(x)_A).pkg)
o/$(MODE)/test/libc/unicode/%.com.dbg: \
$(TEST_LIBC_UNICODE_DEPS) \
o/$(MODE)/test/libc/unicode/%.o \
o/$(MODE)/test/libc/unicode/unicode.pkg \
$(LIBC_TESTMAIN) \
$(CRT) \
$(APE_NO_MODIFY_SELF)
@$(APELINK)
.PHONY: o/$(MODE)/test/libc/unicode
o/$(MODE)/test/libc/unicode: \
$(TEST_LIBC_UNICODE_BINS) \
$(TEST_LIBC_UNICODE_CHECKS)

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

@ -35,7 +35,6 @@ TEST_LIBC_X_DIRECTDEPS = \
LIBC_STUBS \
LIBC_SYSV \
LIBC_TESTLIB \
LIBC_UNICODE \
LIBC_X \
THIRD_PARTY_GDTOA