summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-15 22:20:04 +0200
committerGitHub <noreply@github.com>2019-05-15 22:20:04 +0200
commit7ede1594652003e1ec545dc5c98c44142dcdd7c3 (patch)
treec336eb07ee946b91c84417dfc7ae04791f149ec8 /Makefile
parent3057572fc1d7955fd0425c1a478c58d5e2488f53 (diff)
parenta86aa4b1e92a7d53c932dd0b06c9f51bfce47e18 (diff)
downloadpodman-7ede1594652003e1ec545dc5c98c44142dcdd7c3.tar.gz
podman-7ede1594652003e1ec545dc5c98c44142dcdd7c3.tar.bz2
podman-7ede1594652003e1ec545dc5c98c44142dcdd7c3.zip
Merge pull request #3089 from baude/splittest
split remote tests from distro tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 10ba14248..d464b3f5a 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,9 @@ ginkgo:
ginkgo-remote:
ginkgo -v -tags "$(BUILDTAGS) remoteclient" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/.
-localintegration: varlink_generate test-binaries ginkgo ginkgo-remote
+localintegration: varlink_generate test-binaries ginkgo
+
+remoteintegration: varlink_generate test-binaries ginkgo-remote
localsystem: .install.ginkgo
ginkgo -v -noColor test/system/
@@ -262,7 +264,9 @@ install: .gopathok install.bin install.man install.cni install.systemd ## Insta
install.bin:
install ${SELINUXOPT} -d -m 755 $(BINDIR)
install ${SELINUXOPT} -m 755 bin/podman $(BINDIR)/podman
+ install ${SELINUXOPT} -m 755 bin/podman-remote $(BINDIR)/podman-remote
test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman
+ test -z "${SELINUXOPT}" || chcon --verbose --reference=$(BINDIR)/podman bin/podman-remote
install.man: docs
install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1