From aa881a0c7110de5104f7eb85e7f9210db84f45d8 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 6 Feb 2019 11:57:46 -0700 Subject: Makefile: minor fix to reenable system tests PR #2259 removed the .install.gomega Makefile target but didn't clean up two references to it. Do so now. Also, when setting up GOPKGBASEDIR symlink, use -f (force) flag; otherwise subsequent makes will fail. Signed-off-by: Ed Santiago --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ae791e5e0..391793daa 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ help: .gopathok: ifeq ("$(wildcard $(GOPKGDIR))","") mkdir -p "$(GOPKGBASEDIR)" - ln -s "$(CURDIR)" "$(GOPKGBASEDIR)" + ln -sf "$(CURDIR)" "$(GOPKGBASEDIR)" endif touch $@ @@ -182,10 +182,10 @@ ginkgo-remote: localintegration: varlink_generate test-binaries ginkgo ginkgo-remote -localsystem: .install.ginkgo .install.gomega +localsystem: .install.ginkgo ginkgo -v -noColor test/system/ -system.test-binary: .install.ginkgo .install.gomega +system.test-binary: .install.ginkgo $(GO) test -c ./test/system perftest: -- cgit v1.2.3-54-g00ecf