gomod: use test binaries from go modules
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Mar 3, 2019 at 20:00 UTC
27f73fa7e4b59412b56884922e0709fffe6b7552
4 files changed
+17
-15
go.mod
+2
@@ -54,11 +54,13 @@ require (
54
github.com/ipfs/go-path v0.0.1
55
github.com/ipfs/go-unixfs v0.0.1
56
github.com/ipfs/go-verifcid v0.0.1
57
+ github.com/ipfs/hang-fds v0.0.1
58
github.com/ipfs/interface-go-ipfs-core v0.0.1
59
github.com/ipfs/iptb v1.4.0
60
github.com/ipfs/iptb-plugins v0.0.1
61
github.com/jbenet/go-is-domain v0.0.0-20160119110217-ba9815c809e0
62
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
63
+ github.com/jbenet/go-random-files v0.0.0-20190219210431-31b3f20ebded
64
github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2
65
github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8
66
github.com/libp2p/go-libp2p v0.0.1
go.sum
+4
@@ -185,6 +185,8 @@ github.com/ipfs/go-unixfs v0.0.1 h1:CTTGqLxU5+PRkkeA+w1peStqRWFD1Kya+yZgIT4Xy1w=
185
github.com/ipfs/go-unixfs v0.0.1/go.mod h1:ZlB83nMtxNMx4DAAE5/GixeKN1qHC+xspBksI7Q5NeI=
186
github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E=
187
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
188
+github.com/ipfs/hang-fds v0.0.1 h1:KGAxiGtJPT3THVRNT6yxgpdFPeX4ZemUjENOt6NlOn4=
189
+github.com/ipfs/hang-fds v0.0.1/go.mod h1:U4JNbzwTpk/qP2Ms4VgrZ4HcgJGVosBJqMXvwe4udSY=
190
github.com/ipfs/interface-go-ipfs-core v0.0.1 h1:IlAKkUPyw77UECt25WymL72A4KO+BGCMULKfMfc2R5g=
191
github.com/ipfs/interface-go-ipfs-core v0.0.1/go.mod h1:CbFOGVGV8B4NCA0fAO2VVZ1Jt/ZQYE3FzTC6nLVqiAE=
192
github.com/ipfs/iptb v1.4.0 h1:YFYTrCkLMRwk/35IMyC6+yjoQSHTEcNcefBStLJzgvo=
@@ -203,6 +205,8 @@ github.com/jbenet/go-is-domain v0.0.0-20160119110217-ba9815c809e0 h1:qxMncUW0TzV
205
github.com/jbenet/go-is-domain v0.0.0-20160119110217-ba9815c809e0/go.mod h1:I9DYFcJAixF5f9iOu/9oC451/bq+QDTaLGznkcJPWgg=
206
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c h1:uUx61FiAa1GI6ZmVd2wf2vULeQZIKG66eybjNXKYCz4=
207
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c/go.mod h1:sdx1xVM9UuLw1tXnhJWN3piypTUO3vCIHYmG15KE/dU=
208
+github.com/jbenet/go-random-files v0.0.0-20190219210431-31b3f20ebded h1:fHCa28iw+qaRWZK4IqrntHxXALD5kKr/ESrpOCRRdrg=
209
+github.com/jbenet/go-random-files v0.0.0-20190219210431-31b3f20ebded/go.mod h1:FKvZrl5nnaGnTAMewcq0i7wM5zHD75e0lwlnF8q46uo=
210
github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2 h1:vhC1OXXiT9R2pczegwz6moDvuRpggaroAXhPIseh57A=
211
github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod h1:8GXXJV31xl8whumTzdZsTt3RnUIiPqzkyf7mxToRCMs=
212
github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8 h1:bspPhN+oKYFk5fcGNuQzp6IGzYQSenLEgH3s6jkXrWw=
mk/golang.mk
+4
@@ -30,6 +30,10 @@ define go-build-relative
30
$(GOCC) build $(go-flags-with-tags) -o "$@" "$(call go-pkg-name,$<)"
31
endef
32
33
+define go-build
34
+$(GOCC) build $(go-flags-with-tags) -o "$@" "$(1)"
35
+endef
36
+
37
define go-try-build
38
$(GOCC) build $(go-flags-with-tags) -o /dev/null "$(call go-pkg-name,$<)"
39
endef
test/bin/Rules.mk
+7
-15
@@ -26,32 +26,24 @@ $(d)/json-to-junit: test/dependencies/json-to-junit
26
$(go-build-relative)
27
TGTS_$(d) += $(d)/json-to-junit
28
29
-TGTS_GX_$(d) := hang-fds
30
-TGTS_GX_$(d) := $(addprefix $(d)/,$(TGTS_GX_$(d)))
29
+$(d)/hang-fds:
30
+ $(call go-build,github.com/ipfs/hang-fds)
31
+TGTS_$(d) += $(d)/hang-fds
32
32
-$(TGTS_GX_$(d)):
33
- go build $(go-flags-with-tags) -o "$@" "$(call gx-path,$(notdir $@))"
34
-
35
-TGTS_$(d) += $(TGTS_GX_$(d))
36
-
37
-# multihash is special
33
$(d)/multihash:
39
- go build $(go-flags-with-tags) -o "$@" "gx/ipfs/$(shell gx deps find go-multihash)/go-multihash/multihash"
34
+ $(call go-build,github.com/multiformats/go-multihash/multihash)
35
TGTS_$(d) += $(d)/multihash
36
42
-# cid-fmt is also special
37
$(d)/cid-fmt:
44
- go build $(go-flags-with-tags) -o "$@" "gx/ipfs/$(shell gx deps find go-cidutil)/go-cidutil/cid-fmt"
38
+ $(call go-build,github.com/ipfs/go-cidutil/cid-fmt)
39
TGTS_$(d) += $(d)/cid-fmt
40
47
-# random is also special
41
$(d)/random:
49
- go build -i $(go-flags-with-tags) -o "$@" "gx/ipfs/$(shell gx deps find go-random)/go-random/random"
42
+ $(call go-build,github.com/jbenet/go-random/random)
43
TGTS_$(d) += $(d)/random
44
52
-# random-files is also special
45
$(d)/random-files:
54
- go build -i $(go-flags-with-tags) -o "$@" "gx/ipfs/$(shell gx deps find go-random-files)/go-random-files/random-files"
46
+ $(call go-build,github.com/jbenet/go-random-files/random-files)
47
TGTS_$(d) += $(d)/random-files
48
49