diff options
| -rw-r--r-- | Makefile | 79 | ||||
| -rw-r--r-- | deps.mk | 30 | ||||
| -rwxr-xr-x | mkdeps.sh | 27 | ||||
| -rw-r--r-- | src/glaze.go | 10 | ||||
| -rw-r--r-- | tests/glaze.go | 2 |
5 files changed, 112 insertions, 36 deletions
@@ -17,7 +17,7 @@ MANDIR = $(SHAREDIR)/man EXEC = ./ ## Where to store the installation. Empty by default. DESTDIR = -LDLIBS = +LDLIBS = --static GOCFLAGS = -I $(GOLIBDIR) GOLDFLAGS = -L $(GOLIBDIR) @@ -26,17 +26,26 @@ GOLDFLAGS = -L $(GOLIBDIR) .SUFFIXES: .SUFFIXES: .go .a .bin .bin-check +.go.a: + go tool compile $(GOCFLAGS) -I $(@D) -o $@ -p $(*F) \ + `find $< $$(if [ $(*F) != main ]; then \ + echo src/$(NAME).go src/version.go; fi) | uniq` + +.a.bin: + go tool link $(GOLDFLAGS) -L $(@D) -o $@ --extldflags '$(LDLIBS)' $< + all: include deps.mk -objects = \ - src/$(NAME).a \ - src/main.a \ - tests/$(NAME).a \ - tests/main.a \ +libs.a = $(libs.go:.go=.a) +mains.a = $(mains.go:.go=.a) +mains.bin = $(mains.go:.go=.bin) +functional-tests/lib.a = $(functional-tests/lib.go:.go=.a) +fuzz-targets/lib.a = $(fuzz-targets/lib.go:.go=.a) +benchmarks/lib.a = $(benchmarks/lib.go:.go=.a) sources = \ src/$(NAME).go \ @@ -46,13 +55,15 @@ sources = \ derived-assets = \ src/version.go \ - $(objects) \ - src/main.bin \ - tests/main.bin \ + $(libs.a) \ + $(mains.a) \ + $(mains.bin) \ $(NAME).bin \ side-assets = \ $(NAME).socket \ + tests/fuzz/corpus/ \ + tests/benchmarks/*/main.txt \ @@ -61,36 +72,26 @@ side-assets = \ all: $(derived-assets) -$(objects): Makefile +$(libs.a): Makefile deps.mk +$(libs.a): src/$(NAME).go src/version.go -src/$(NAME).a: src/$(NAME).go src/version.go - go tool compile $(GOCFLAGS) -o $@ -p $(*F) -I $(@D) $*.go src/version.go -src/main.a: src/main.go src/$(NAME).a -tests/main.a: tests/main.go tests/$(NAME).a -src/main.a tests/main.a: - go tool compile $(GOCFLAGS) -o $@ -p $(*F) -I $(@D) $*.go +$(fuzz-targets/lib.a): + go tool compile $(GOCFLAGS) -o $@ -p $(NAME) -d=libfuzzer \ + $*.go src/$(NAME).go src/version.go -tests/$(NAME).a: tests/$(NAME).go src/$(NAME).go src/version.go - go tool compile $(GOCFLAGS) -o $@ -p $(*F) $*.go src/$(*F).go src/version.go - -src/main.bin: src/main.a -tests/main.bin: tests/main.a -src/main.bin tests/main.bin: - go tool link $(GOLDFLAGS) -o $@ -L $(@D) --extldflags '$(LDLIBS)' $*.a +src/version.go: Makefile + echo 'package $(NAME); const Version = "$(VERSION)"' > $@ $(NAME).bin: src/main.bin ln -fs $? $@ -src/version.go: Makefile - echo 'package $(NAME); const Version = "$(VERSION)"' > $@ - tests.bin-check = \ - tests/main.bin-check \ + tests/main.bin-check \ + $(functional-tests/main.go:.go=.bin-check) \ -tests/main.bin-check: tests/main.bin $(tests.bin-check): $(EXEC)$*.bin @@ -107,6 +108,7 @@ $(integration-tests): ALWAYS sh $@ check-integration: $(integration-tests) +check-integration: fuzz ## Run all tests. Each test suite is isolated, so that a parallel @@ -116,6 +118,27 @@ check: check-unit check-integration +FUZZSEC=1 +fuzz-targets/main.bin-check = $(fuzz-targets/main.go:.go=.bin-check) +$(fuzz-targets/main.bin-check): + $(EXEC)$*.bin --test.fuzztime=$(FUZZSEC)s \ + --test.fuzz='.*' --test.fuzzcachedir=tests/fuzz/corpus + +fuzz: $(fuzz-targets/main.bin-check) + + + +benchmarks/main.bin-check = $(benchmarks/main.go:.go=.bin-check) +$(benchmarks/main.bin-check): + rm -f $*.txt + printf '%s\n' '$(EXEC)$*.bin' >> $*.txt + LANG=POSIX.UTF-8 time -p $(EXEC)$*.bin 2>> $*.txt + printf '%s\n' '$*.txt' + +bench: $(benchmarks/main.bin-check) + + + ## Remove *all* derived artifacts produced during the build. ## A dedicated test asserts that this is always true. clean: @@ -0,0 +1,30 @@ +libs.go = \ + src/glaze.go \ + tests/glaze.go \ + +mains.go = \ + src/main.go \ + tests/main.go \ + +functional-tests/libs.go = \ + +functional-tests/main.go = \ + +fuzz-targets/lib.go = \ + +fuzz-targets/main.go = \ + +benchmarks/lib.go = \ + +benchmarks/main.go = \ + +src/glaze.a: src/glaze.go +src/main.a: src/main.go +tests/glaze.a: tests/glaze.go +tests/main.a: tests/main.go +src/main.bin: src/main.a +tests/main.bin: tests/main.a +src/main.bin-check: src/main.bin +tests/main.bin-check: tests/main.bin +src/main.a: src/$(NAME).a +tests/main.a: tests/$(NAME).a @@ -3,8 +3,27 @@ set -eu export LANG=POSIX.UTF-8 -varlist() { - printf '%s = \\\n' "$1" - sed 's|^\(.*\)$|\t\1 \\|' - printf '\n' + +libs() { + find src tests -name '*.go' | grep -v '/main\.go$' | + grep -v '/version\.go$' +} + +mains() { + find src tests -name '*.go' | grep '/main\.go$' } + +libs | varlist 'libs.go' +mains | varlist 'mains.go' + +find tests/functional/*/*.go -not -name main.go | varlist 'functional-tests/libs.go' +find tests/functional/*/main.go | varlist 'functional-tests/main.go' +find tests/fuzz/*/*.go -not -name main.go | varlist 'fuzz-targets/lib.go' +find tests/fuzz/*/main.go | varlist 'fuzz-targets/main.go' +find tests/benchmarks/*/*.go -not -name main.go | varlist 'benchmarks/lib.go' +find tests/benchmarks/*/main.go | varlist 'benchmarks/main.go' + +{ libs; mains; } | sort | sed 's/^\(.*\)\.go$/\1.a:\t\1.go/' +mains | sort | sed 's/^\(.*\)\.go$/\1.bin:\t\1.a/' +mains | sort | sed 's/^\(.*\)\.go$/\1.bin-check:\t\1.bin/' +mains | sort | sed 's|^\(.*\)/main\.go$|\1/main.a:\t\1/$(NAME).a|' diff --git a/src/glaze.go b/src/glaze.go index f5b2886..1431ba4 100644 --- a/src/glaze.go +++ b/src/glaze.go @@ -15,7 +15,7 @@ import ( "strings" "syscall" - + "guuid" g "gobang" ) @@ -204,7 +204,7 @@ func handlerForDynPath(path string) (pathInfo, func(pathInfo, http.ResponseWrite func handlerFor(path string) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - id := g.NewUUID() + id := guuid.New() g.Info("in-request", "in-request", "path", path, "id", id) defer g.Info("in-response", "in-response", "path", path, "id", id) @@ -268,10 +268,14 @@ func start(listener net.Listener) { g.FatalIf(err) } +func Init() { + g.Init(slog.Group("versions", "gobang", g.Version, "this", Version)) +} + func Main() { - g.Init(slog.Group("versions", "gobang", g.Version, "this", version)) + Init() addr := parseArgs(os.Args) listener := listen(addr) start(listener) diff --git a/tests/glaze.go b/tests/glaze.go index 366efa0..98bbc1a 100644 --- a/tests/glaze.go +++ b/tests/glaze.go @@ -26,7 +26,7 @@ func test_adjustPattern() { } for i, input := range inputs { - g.AssertEqual(adjustPattern(input), expected[i]) + g.TAssertEqual(adjustPattern(input), expected[i]) } } |