From 9d3359f93346d0005af78a0d7a4865d05a2af7bf Mon Sep 17 00:00:00 2001 From: Kiichiro YUKAWA Date: Tue, 4 Feb 2025 16:03:18 +0900 Subject: [PATCH] Add TEST_LDFLAGS (#2829) * :recycle: Add Link opts for HDF Flg Signed-off-by: vankichi * :recycle: Add TEST_FLAGS Signed-off-by: vankichi --------- Signed-off-by: vankichi --- Makefile | 1 + Makefile.d/bench.mk | 12 ++++++------ Makefile.d/functions.mk | 10 +++++----- Makefile.d/test.mk | 38 +++++++++++++++++++------------------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 73645e3120..d0ae3db8f5 100644 --- a/Makefile +++ b/Makefile @@ -164,6 +164,7 @@ NGT_LDFLAGS = -fopenmp -lopenblas -llapack FAISS_LDFLAGS = $(NGT_LDFLAGS) -lgfortran HDF5_LDFLAGS = -lhdf5 -lhdf5_hl -lsz -laec -lz -ldl CGO_LDFLAGS = $(FAISS_LDFLAGS) $(HDF5_LDFLAGS) +TEST_LDFLAGS = $(LDFLAGS) $(FAISS_LDFLAGS) $(HDF5_LDFLAGS) ifeq ($(GOARCH),amd64) CFLAGS ?= -mno-avx512f -mno-avx512dq -mno-avx512cd -mno-avx512bw -mno-avx512vl diff --git a/Makefile.d/bench.mk b/Makefile.d/bench.mk index 1af5c6f397..4175171fb0 100644 --- a/Makefile.d/bench.mk +++ b/Makefile.d/bench.mk @@ -130,7 +130,7 @@ pprof/core/ngt/sequential.bin: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -mod=readonly \ -count=1 \ @@ -155,7 +155,7 @@ pprof/core/ngt/parallel.bin: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -mod=readonly \ -count=1 \ @@ -187,7 +187,7 @@ pprof/agent/stream.bin: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -mod=readonly \ -count=1 \ @@ -213,7 +213,7 @@ pprof/agent/sequential/grpc.bin: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -mod=readonly \ -count=1 \ @@ -244,7 +244,7 @@ pprof/gateway/sequential.bin: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -mod=readonly \ -count=1 \ @@ -293,7 +293,7 @@ $(ROOTDIR)/metrics.gob: GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -mod=readonly -v --timeout=1h $(ROOTDIR)/hack/benchmark/e2e/agent/core/ngt/... -output=$(ROOTDIR)/metrics.gob .PHONY: metrics/chart diff --git a/Makefile.d/functions.mk b/Makefile.d/functions.mk index fb4feb167f..58d8ca8f17 100644 --- a/Makefile.d/functions.mk +++ b/Makefile.d/functions.mk @@ -135,7 +135,7 @@ define run-e2e-crud-test GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(HDF5_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -race \ -mod=readonly \ @@ -174,7 +174,7 @@ define run-e2e-crud-faiss-test GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(HDF5_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -race \ -mod=readonly \ @@ -200,7 +200,7 @@ define run-e2e-multi-crud-test GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(HDF5_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -race \ -mod=readonly \ @@ -230,7 +230,7 @@ define run-e2e-max-dim-test GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(HDF5_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -race \ -mod=readonly \ @@ -252,7 +252,7 @@ define run-e2e-sidecar-test GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(HDF5_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test \ -race \ -mod=readonly \ diff --git a/Makefile.d/test.mk b/Makefile.d/test.mk index 7b0e1361bf..ebcdc0a14a 100644 --- a/Makefile.d/test.mk +++ b/Makefile.d/test.mk @@ -45,7 +45,7 @@ test: GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... $(ROOTDIR)/internal/... $(ROOTDIR)/pkg/... .PHONY: test/tparse @@ -57,7 +57,7 @@ test/tparse: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... $(ROOTDIR)/internal/... $(ROOTDIR)/pkg/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -71,7 +71,7 @@ test/cmd/tparse: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -85,7 +85,7 @@ test/internal/tparse: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/internal/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -99,7 +99,7 @@ test/pkg/tparse: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/pkg/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -115,7 +115,7 @@ test/hack/tparse: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=vendor -json -cover \ $(ROOTDIR)/hack/gorules/... \ $(ROOTDIR)/hack/helm/... \ @@ -134,7 +134,7 @@ test/all/tparse: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -148,7 +148,7 @@ test/gotestfmt: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... $(ROOTDIR)/internal/... $(ROOTDIR)/pkg/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -162,7 +162,7 @@ test/cmd/gotestfmt: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -176,7 +176,7 @@ test/internal/gotestfmt: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/internal/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -190,7 +190,7 @@ test/pkg/gotestfmt: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/pkg/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -206,7 +206,7 @@ test/hack/gotestfmt: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=vendor -json -cover \ $(ROOTDIR)/hack/gorules/... \ $(ROOTDIR)/hack/helm/... \ @@ -225,7 +225,7 @@ test/all/gotestfmt: \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -263,7 +263,7 @@ test/pkg: GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -cover $(ROOTDIR)/pkg/... .PHONY: test/internal @@ -272,7 +272,7 @@ test/internal: GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -cover $(ROOTDIR)/internal/... .PHONY: test/cmd @@ -281,7 +281,7 @@ test/cmd: GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -cover $(ROOTDIR)/cmd/... .PHONY: test/rust/qbg @@ -302,7 +302,7 @@ test/hack: GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=vendor -cover \ $(ROOTDIR)/hack/gorules... \ $(ROOTDIR)/hack/helm/... \ @@ -316,7 +316,7 @@ test/all: GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -cover $(ROOTDIR)/... .PHONY: coverage @@ -325,7 +325,7 @@ coverage: GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - CGO_LDFLAGS="$(CGO_LDFLAGS)" \ + CGO_LDFLAGS="$(TEST_LDFLAGS)" \ go test -short -shuffle=on -race -mod=readonly -v -race -covermode=atomic -timeout=$(GOTEST_TIMEOUT) -coverprofile=coverage.out $(ROOTDIR)/... GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \