Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17965 from serathius/makefile-cache

Browse Source 
Fix caching by not depending on PHONY target in non-PHONY target
This commit is contained in:
Marek Siarkowicz 2024-05-08 16:47:45 +02:00 committed by GitHub
commit c4ff2c20bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/robustness/makefile.mk
View File

@ -37,31 +37,34 @@ test-robustness-issue15271: /tmp/etcd-v3.5.7-failpoints/bin
# Failpoints # Failpoints
GOPATH = $(shell go env GOPATH)
GOFAIL_VERSION = $(shell cd tools/mod && go list -m -f {{.Version}} go.etcd.io/gofail) GOFAIL_VERSION = $(shell cd tools/mod && go list -m -f {{.Version}} go.etcd.io/gofail)
.PHONY:install-gofail
install-gofail: $(GOPATH)/bin/gofail
.PHONY: gofail-enable .PHONY: gofail-enable
gofail-enable: install-gofail gofail-enable: $(GOPATH)/bin/gofail
gofail enable server/etcdserver/ server/lease/leasehttp server/storage/backend/ server/storage/mvcc/ server/storage/wal/ server/etcdserver/api/v3rpc/ $(GOPATH)/bin/gofail enable server/etcdserver/ server/lease/leasehttp server/storage/backend/ server/storage/mvcc/ server/storage/wal/ server/etcdserver/api/v3rpc/
cd ./server && go get go.etcd.io/gofail@${GOFAIL_VERSION} cd ./server && go get go.etcd.io/gofail@${GOFAIL_VERSION}
cd ./etcdutl && go get go.etcd.io/gofail@${GOFAIL_VERSION} cd ./etcdutl && go get go.etcd.io/gofail@${GOFAIL_VERSION}
cd ./etcdctl && go get go.etcd.io/gofail@${GOFAIL_VERSION} cd ./etcdctl && go get go.etcd.io/gofail@${GOFAIL_VERSION}
cd ./tests && go get go.etcd.io/gofail@${GOFAIL_VERSION} cd ./tests && go get go.etcd.io/gofail@${GOFAIL_VERSION}
.PHONY: gofail-disable .PHONY: gofail-disable
gofail-disable: install-gofail gofail-disable: $(GOPATH)/bin/gofail
gofail disable server/etcdserver/ server/lease/leasehttp server/storage/backend/ server/storage/mvcc/ server/storage/wal/ server/etcdserver/api/v3rpc/ $(GOPATH)/bin/gofail disable server/etcdserver/ server/lease/leasehttp server/storage/backend/ server/storage/mvcc/ server/storage/wal/ server/etcdserver/api/v3rpc/
cd ./server && go mod tidy cd ./server && go mod tidy
cd ./etcdutl && go mod tidy cd ./etcdutl && go mod tidy
cd ./etcdctl && go mod tidy cd ./etcdctl && go mod tidy
cd ./tests && go mod tidy cd ./tests && go mod tidy
.PHONY: install-gofail $(GOPATH)/bin/gofail: tools/mod/go.mod tools/mod/go.sum
install-gofail:
go install go.etcd.io/gofail@${GOFAIL_VERSION} go install go.etcd.io/gofail@${GOFAIL_VERSION}
# Build previous releases for robustness tests # Build previous releases for robustness tests
/tmp/etcd-v3.6.0-failpoints/bin: install-gofail /tmp/etcd-v3.6.0-failpoints/bin: $(GOPATH)/bin/gofail
rm -rf /tmp/etcd-v3.6.0-failpoints/ rm -rf /tmp/etcd-v3.6.0-failpoints/
mkdir -p /tmp/etcd-v3.6.0-failpoints/ mkdir -p /tmp/etcd-v3.6.0-failpoints/
cd /tmp/etcd-v3.6.0-failpoints/; \ cd /tmp/etcd-v3.6.0-failpoints/; \
@ -72,7 +75,7 @@ install-gofail:
/tmp/etcd-v3.5.2-failpoints/bin: /tmp/etcd-v3.5.2-failpoints/bin:
/tmp/etcd-v3.5.4-failpoints/bin: /tmp/etcd-v3.5.4-failpoints/bin:
/tmp/etcd-v3.5.5-failpoints/bin: /tmp/etcd-v3.5.5-failpoints/bin:
/tmp/etcd-v3.5.%-failpoints/bin: install-gofail /tmp/etcd-v3.5.%-failpoints/bin: $(GOPATH)/bin/gofail
rm -rf /tmp/etcd-v3.5.$*-failpoints/ rm -rf /tmp/etcd-v3.5.$*-failpoints/
mkdir -p /tmp/etcd-v3.5.$*-failpoints/ mkdir -p /tmp/etcd-v3.5.$*-failpoints/
cd /tmp/etcd-v3.5.$*-failpoints/; \ cd /tmp/etcd-v3.5.$*-failpoints/; \
@ -83,7 +86,7 @@ install-gofail:
(cd etcdutl; go get go.etcd.io/gofail@${GOFAIL_VERSION}); \ (cd etcdutl; go get go.etcd.io/gofail@${GOFAIL_VERSION}); \
FAILPOINTS=true ./build; FAILPOINTS=true ./build;
/tmp/etcd-release-3.5-failpoints/bin: install-gofail /tmp/etcd-release-3.5-failpoints/bin: $(GOPATH)/bin/gofail
rm -rf /tmp/etcd-release-3.5-failpoints/ rm -rf /tmp/etcd-release-3.5-failpoints/
mkdir -p /tmp/etcd-release-3.5-failpoints/ mkdir -p /tmp/etcd-release-3.5-failpoints/
cd /tmp/etcd-release-3.5-failpoints/; \ cd /tmp/etcd-release-3.5-failpoints/; \
@ -95,7 +98,7 @@ install-gofail:
FAILPOINTS=true ./build; FAILPOINTS=true ./build;
/tmp/etcd-v3.4.23-failpoints/bin: /tmp/etcd-v3.4.23-failpoints/bin:
/tmp/etcd-v3.4.%-failpoints/bin: install-gofail /tmp/etcd-v3.4.%-failpoints/bin: $(GOPATH)/bin/gofail
rm -rf /tmp/etcd-v3.4.$*-failpoints/ rm -rf /tmp/etcd-v3.4.$*-failpoints/
mkdir -p /tmp/etcd-v3.4.$*-failpoints/ mkdir -p /tmp/etcd-v3.4.$*-failpoints/
cd /tmp/etcd-v3.4.$*-failpoints/; \ cd /tmp/etcd-v3.4.$*-failpoints/; \
@ -103,7 +106,7 @@ install-gofail:
go get go.etcd.io/gofail@${GOFAIL_VERSION}; \ go get go.etcd.io/gofail@${GOFAIL_VERSION}; \
FAILPOINTS=true ./build; FAILPOINTS=true ./build;
/tmp/etcd-release-3.4-failpoints/bin: install-gofail /tmp/etcd-release-3.4-failpoints/bin: $(GOPATH)/bin/gofail
rm -rf /tmp/etcd-release-3.4-failpoints/ rm -rf /tmp/etcd-release-3.4-failpoints/
mkdir -p /tmp/etcd-release-3.4-failpoints/ mkdir -p /tmp/etcd-release-3.4-failpoints/
cd /tmp/etcd-release-3.4-failpoints/; \ cd /tmp/etcd-release-3.4-failpoints/; \