summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2019-02-06 11:57:46 -0700
committerEd Santiago <santiago@redhat.com>2019-02-06 12:04:21 -0700
commitaa881a0c7110de5104f7eb85e7f9210db84f45d8 (patch)
treeb5f4c87149533bbed930f4f155c32e5bdc2c5bdd
parentca6ab2029caae9fcea35579c87634a0520284aae (diff)
downloadpodman-aa881a0c7110de5104f7eb85e7f9210db84f45d8.tar.gz
podman-aa881a0c7110de5104f7eb85e7f9210db84f45d8.tar.bz2
podman-aa881a0c7110de5104f7eb85e7f9210db84f45d8.zip
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>
-rw-r--r--Makefile6
1 files 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: