mirror of
https://github.com/containers/podman.git
synced 2025-06-26 04:46:57 +08:00
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 <santiago@redhat.com>
This commit is contained in:
6
Makefile
6
Makefile
@ -85,7 +85,7 @@ help:
|
|||||||
.gopathok:
|
.gopathok:
|
||||||
ifeq ("$(wildcard $(GOPKGDIR))","")
|
ifeq ("$(wildcard $(GOPKGDIR))","")
|
||||||
mkdir -p "$(GOPKGBASEDIR)"
|
mkdir -p "$(GOPKGBASEDIR)"
|
||||||
ln -s "$(CURDIR)" "$(GOPKGBASEDIR)"
|
ln -sf "$(CURDIR)" "$(GOPKGBASEDIR)"
|
||||||
endif
|
endif
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
@ -182,10 +182,10 @@ ginkgo-remote:
|
|||||||
|
|
||||||
localintegration: varlink_generate test-binaries ginkgo ginkgo-remote
|
localintegration: varlink_generate test-binaries ginkgo ginkgo-remote
|
||||||
|
|
||||||
localsystem: .install.ginkgo .install.gomega
|
localsystem: .install.ginkgo
|
||||||
ginkgo -v -noColor test/system/
|
ginkgo -v -noColor test/system/
|
||||||
|
|
||||||
system.test-binary: .install.ginkgo .install.gomega
|
system.test-binary: .install.ginkgo
|
||||||
$(GO) test -c ./test/system
|
$(GO) test -c ./test/system
|
||||||
|
|
||||||
perftest:
|
perftest:
|
||||||
|
Reference in New Issue
Block a user