From f629ccb8ed8996b3d41193852563f3d09256da56 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 23 Mar 2017 09:53:40 +0000 Subject: [PATCH] Fix mismatched code coverage errors 'codecgen' embeds a random integer in each identifier; this means code coverage across different CircleCI lanes may not match. Here we force the integer to 23 on every CircleCI build so they always match. --- Makefile | 3 ++- circle.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 793af88663..aa536727a3 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(DOCKER_VE RUNSVINIT=vendor/runsvinit/runsvinit CODECGEN_DIR=vendor/github.com/ugorji/go/codec/codecgen CODECGEN_EXE=$(CODECGEN_DIR)/bin/codecgen_$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH) +CODECGEN_UID=0 GET_CODECGEN_DEPS=$(shell find $(1) -maxdepth 1 -type f -name '*.go' -not -name '*_test.go' -not -name '*.codecgen.go' -not -name '*.generated.go') CODECGEN_TARGETS=report/report.codecgen.go render/detailed/detailed.codecgen.go RM=--rm @@ -110,7 +111,7 @@ $(SCOPE_EXE): $(SCOPE_BACKEND_BUILD_UPTODATE) %.codecgen.go: $(CODECGEN_EXE) rm -f $@; $(GO_HOST) build $(GO_BUILD_FLAGS) ./$(@D) # workaround for https://github.com/ugorji/go/issues/145 - cd $(@D) && $(WITH_GO_HOST_ENV) $(shell pwd)/$(CODECGEN_EXE) -rt $(GO_BUILD_TAGS) -u -o $(@F) $(notdir $(call GET_CODECGEN_DEPS,$(@D))) + cd $(@D) && $(WITH_GO_HOST_ENV) $(shell pwd)/$(CODECGEN_EXE) -d $(CODECGEN_UID) -rt $(GO_BUILD_TAGS) -u -o $(@F) $(notdir $(call GET_CODECGEN_DEPS,$(@D))) $(CODECGEN_EXE): $(CODECGEN_DIR)/*.go mkdir -p $(@D) diff --git a/circle.yml b/circle.yml index ce9c031fc3..7577c34807 100644 --- a/circle.yml +++ b/circle.yml @@ -42,7 +42,7 @@ test: override: - cd $SRCDIR; make RM= lint: parallel: true - - cd $SRCDIR; COVERDIR=./coverage make RM= tests: + - cd $SRCDIR; COVERDIR=./coverage make RM= CODECGEN_UID=23 tests: parallel: true - cd $SRCDIR; make RM= client-test static: parallel: true