Skip to content

Commit 0e24caa

Browse files
dtchanpuraoblitorum
authored andcommitted
Archived fixtures/udev similar to fixtures/sys to avoid go-get errors, fixes prometheus#2482 (prometheus#2485)
Signed-off-by: Darshil Chanpura <[email protected]>
1 parent 5cec10e commit 0e24caa

File tree

18 files changed

+536
-465
lines changed

18 files changed

+536
-465
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ dependencies-stamp
3535
vendor/
3636
# Test files extracted from ttar
3737
collector/fixtures/sys/
38+
collector/fixtures/udev/
3839

3940
/vendor

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ $(eval $(call goarch_pair,mips64el,mipsel))
8888
all:: vet checkmetrics checkrules common-all $(cross-test) $(test-e2e)
8989

9090
.PHONY: test
91-
test: collector/fixtures/sys/.unpacked
91+
test: collector/fixtures/sys/.unpacked collector/fixtures/udev/.unpacked
9292
@echo ">> running tests"
9393
$(GO) test -short $(test-flags) $(pkgs)
9494

9595
.PHONY: test-32bit
96-
test-32bit: collector/fixtures/sys/.unpacked
96+
test-32bit: collector/fixtures/sys/.unpacked collector/fixtures/udev/.unpacked
9797
@echo ">> running tests in 32-bit mode"
9898
@env GOARCH=$(GOARCH_CROSS) $(GO) test $(pkgs)
9999

@@ -110,9 +110,12 @@ skip-test-32bit:
110110
update_fixtures:
111111
rm -vf collector/fixtures/sys/.unpacked
112112
./ttar -C collector/fixtures -c -f collector/fixtures/sys.ttar sys
113+
rm -vf collector/fixtures/udev/.unpacked
114+
./ttar -C collector/fixtures -c -f collector/fixtures/udev.ttar udev
115+
113116

114117
.PHONY: test-e2e
115-
test-e2e: build collector/fixtures/sys/.unpacked
118+
test-e2e: build collector/fixtures/sys/.unpacked collector/fixtures/udev/.unpacked
116119
@echo ">> running end-to-end tests"
117120
./end-to-end-test.sh
118121

0 commit comments

Comments
 (0)