summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2024-04-06 09:27:02 -0300
committerEuAndreh <eu@euandre.org>2024-04-06 09:28:21 -0300
commitaec4e931e4194e7d1b7a9c047e70f13433fa8458 (patch)
treed17d160ac3048ec00af5d1319f5dadc6865d90b3
parentrm .tdrc (diff)
downloadpindaiba-aec4e931e4194e7d1b7a9c047e70f13433fa8458.tar.gz
pindaiba-aec4e931e4194e7d1b7a9c047e70f13433fa8458.tar.xz
Canonicalize builds: remove "fuzz" references
-rw-r--r--.gitignore5
-rw-r--r--Makefile27
-rw-r--r--deps.mk12
-rwxr-xr-xmkdeps.sh4
4 files changed, 7 insertions, 41 deletions
diff --git a/.gitignore b/.gitignore
index dae5c0f..783c195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,3 @@
/tests/*.a
/tests/*.bin
/tests/*.c.txt
-/tests/fuzz/*.o
-/tests/fuzz/*.a
-/tests/fuzz/*.bin
-/tests/fuzz/corpus/
-/doc/*.[0-9]
diff --git a/Makefile b/Makefile
index 6ebcbc7..33cbe67 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ LDLIBS = -lsiphash
.SUFFIXES:
-.SUFFIXES: .in .c .o .a .bin .msg .cat .bin-check
+.SUFFIXES: .in .c .o .a .bin .bin-check .msg .cat
.in:
sed \
@@ -50,15 +50,11 @@ sources.o = $(sources.c:.c=.o)
tests.o = $(tests.c:.c=.o)
tests.a = $(tests.c:.c=.a)
tests.bin = $(tests.c:.c=.bin)
-fuzz.o = $(fuzz.c:.c=.o)
-fuzz.a = $(fuzz.c:.c=.a)
-fuzz.bin = $(fuzz.c:.c=.bin)
archives = \
lib$(NAME).a \
$(tests.a) \
$(NAME).a \
- $(fuzz.a) \
sources = \
$(sources.c) \
@@ -84,9 +80,6 @@ derived-assets = \
$(NAME).bin \
side-assets = \
- $(fuzz.o) \
- $(fuzz.a) \
- $(fuzz.bin) \
tests/logerr.c.txt \
tests/catalog.c.txt \
@@ -99,11 +92,9 @@ all: $(derived-assets)
lib$(NAME).a: $(sources.o)
$(NAME).a: $(sources.o) src/main.o
-$(fuzz.bin): lib$(NAME).a
src/config.h: Makefile deps.mk
$(sources.o) $(tests.o) src/main.o: Makefile deps.mk src/config.h
-tests/slurp.o: Makefile deps.mk src/config.h
-tests/slurp.o: tests/slurp.h
+tests/slurp.o: tests/slurp.h Makefile deps.mk src/config.h
$(archives):
@@ -124,19 +115,13 @@ $(tests.bin-check):
check-unit: $(tests.bin-check)
+check-integration:
+
+
## Run all tests. Each test suite is isolated, so that a parallel
## build can run tests at the same time. The required artifacts
## are created if missing.
-check: check-unit
-
-
-
-fuzz.bin-check = $(fuzz.c:.c=.bin-check)
-$(fuzz.bin-check):
- $(EXEC)$*.bin tests/fuzz/corpus/ $(FUZZFLAGS)
-
-## Run fuzzing targets indefinitely.
-fuzz: $(fuzz.bin-check)
+check: check-unit check-integration
diff --git a/deps.mk b/deps.mk
index a88a9a9..6faa254 100644
--- a/deps.mk
+++ b/deps.mk
@@ -1,15 +1,5 @@
catalogs.en.msg = src/pindaiba.en.msg
-catalogs.msg = \
- $(catalogs.en.msg) \
-
-fuzz.c = \
- tests/fuzz/another.c \
- tests/fuzz/hello.c \
-
-tests/fuzz/another.a: tests/fuzz/another.o
-tests/fuzz/hello.a: tests/fuzz/hello.o
-tests/fuzz/another.bin-check: tests/fuzz/another.bin
-tests/fuzz/hello.bin-check: tests/fuzz/hello.bin
+catalogs.msg = $(catalogs.en.msg)
sources.c = \
diff --git a/mkdeps.sh b/mkdeps.sh
index 334de8a..5cf3976 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -16,10 +16,6 @@ cfiles() {
printf 'catalogs.en.msg = %s\n' "$(find src/ -name '*.msg')"
echo 'catalogs.msg = $(catalogs.en.msg)'
-
-find tests/fuzz/*.c | varlist 'fuzz.c'
-find tests/fuzz/*.c | awk -F. '{ printf "%s.a: %s.o\n", $1, $1 }'
-find tests/fuzz/*.c | awk -F. '{ printf "%s.bin-check: %s.bin\n", $1, $1 }'
printf '\n\n'
cfiles | varlist 'sources.c'