aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2019-01-10 15:43:34 -0500
committerGitHub <noreply@github.com>2019-01-10 15:43:34 -0500
commit8e250a82d6581942210225406dad0dd8bfece44e (patch)
treeb0c25988c41ebbec84952163d2c99e6f25009e6e /Makefile
parent6e8aeab472154e2b1eff92683803d16af06d2b30 (diff)
parentbffd2f50c312109d4728373b60215cf03ffcfdf1 (diff)
downloadpodman-8e250a82d6581942210225406dad0dd8bfece44e.tar.gz
podman-8e250a82d6581942210225406dad0dd8bfece44e.tar.bz2
podman-8e250a82d6581942210225406dad0dd8bfece44e.zip
Merge pull request #2136 from mheon/revert_1235
Revert #1235 SHM locking for v1.0
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c672fd947..6a3f18a10 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= e1732a5213147e3c0b7bf60b55a332c3720ecb4b
+EPOCH_TEST_COMMIT ?= 76c57f55cacb7916ca451e378d181b1c30c94032
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
@@ -168,7 +168,7 @@ localunit: test/goecho/goecho varlink_generate
ginkgo:
ginkgo -v -tags "$(BUILDTAGS)" -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/.
-localintegration: varlink_generate test-binaries ginkgo
+localintegration: varlink_generate test-binaries clientintegration ginkgo
localsystem: .install.ginkgo .install.gomega
ginkgo -v -noColor test/system/