diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | deps.mk | 8 | ||||
| -rwxr-xr-x | mkdeps.sh | 8 | ||||
| -rw-r--r-- | src/guuid.go | 4 |
4 files changed, 22 insertions, 20 deletions
@@ -40,12 +40,12 @@ all: include deps.mk -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) +libs.a = $(libs.go:.go=.a) +mains.a = $(mains.go:.go=.a) +mains.bin = $(mains.go:.go=.bin) +functional/lib.a = $(functional/lib.go:.go=.a) +fuzz/lib.a = $(fuzz/lib.go:.go=.a) +benchmarks/lib.a = $(benchmarks/lib.go:.go=.a) sources = \ src/$(NAME).go \ @@ -73,7 +73,7 @@ $(libs.a): Makefile deps.mk $(libs.a): src/$(NAME).go src/version.go -$(fuzz-targets/lib.a): +$(fuzz/lib.a): go tool compile $(GOCFLAGS) -o $@ -p $(NAME) -d=libfuzzer \ $*.go src/$(NAME).go src/version.go @@ -84,7 +84,7 @@ src/version.go: Makefile tests.bin-check = \ tests/main.bin-check \ - $(functional-tests/main.go:.go=.bin-check) \ + $(functional/main.go:.go=.bin-check) \ $(tests.bin-check): $(EXEC)$*.bin @@ -111,12 +111,12 @@ check: check-unit check-integration FUZZSEC=1 -fuzz-targets/main.bin-check = $(fuzz-targets/main.go:.go=.bin-check) -$(fuzz-targets/main.bin-check): +fuzz/main.bin-check = $(fuzz/main.go:.go=.bin-check) +$(fuzz/main.bin-check): $(EXEC)$*.bin --test.fuzztime=$(FUZZSEC)s \ --test.fuzz='.*' --test.fuzzcachedir=tests/fuzz/corpus -fuzz: $(fuzz-targets/main.bin-check) +fuzz: $(fuzz/main.bin-check) @@ -13,17 +13,17 @@ mains.go = \ tests/fuzz/new-from/main.go \ tests/main.go \ -functional-tests/lib.go = \ +functional/lib.go = \ tests/functional/string-round-trip/guuid.go \ -functional-tests/main.go = \ +functional/main.go = \ tests/functional/string-round-trip/main.go \ -fuzz-targets/lib.go = \ +fuzz/lib.go = \ tests/fuzz/from-string/guuid.go \ tests/fuzz/new-from/guuid.go \ -fuzz-targets/main.go = \ +fuzz/main.go = \ tests/fuzz/from-string/main.go \ tests/fuzz/new-from/main.go \ @@ -16,10 +16,10 @@ mains() { libs | varlist 'libs.go' mains | varlist 'mains.go' -find tests/functional/*/*.go -not -name main.go | varlist 'functional-tests/lib.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/functional/*/*.go -not -name main.go | varlist 'functional/lib.go' +find tests/functional/*/main.go | varlist 'functional/main.go' +find tests/fuzz/*/*.go -not -name main.go | varlist 'fuzz/lib.go' +find tests/fuzz/*/main.go | varlist 'fuzz/main.go' find tests/benchmarks/*/*.go -not -name main.go | varlist 'benchmarks/lib.go' find tests/benchmarks/*/main.go | varlist 'benchmarks/main.go' diff --git a/src/guuid.go b/src/guuid.go index e4f5f14..22d783a 100644 --- a/src/guuid.go +++ b/src/guuid.go @@ -20,7 +20,9 @@ var ( dashIndexes = []int{ 8, 13, 18, 23 } randomReader = rand.Reader - ErrBadLength = errors.New("guuid: str isn't of the correct length") + ErrBadLength = errors.New( + "guuid: str isn't of the correct length", + ) ErrBadDashCount = errors.New("guuid: Bad count of dashes in string") ErrBadDashPosition = errors.New("guuid: Bad char in string") ) |