Merge pull request #2245 from prometheus/fish-fix-e2e-64k-page-output

Check 64k-page e2e fixtures
This commit is contained in:
Ben Kochie 2022-06-19 11:01:44 +02:00 committed by GitHub
commit 98889b3705
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -60,12 +60,13 @@ endif
PROMU := $(FIRST_GOPATH)/bin/promu --config $(PROMU_CONF) PROMU := $(FIRST_GOPATH)/bin/promu --config $(PROMU_CONF)
e2e-out-64k-page = collector/fixtures/e2e-64k-page-output.txt
e2e-out = collector/fixtures/e2e-output.txt e2e-out = collector/fixtures/e2e-output.txt
ifeq ($(MACH), ppc64le) ifeq ($(MACH), ppc64le)
e2e-out = collector/fixtures/e2e-64k-page-output.txt e2e-out = $(e2e-out-64k-page)
endif endif
ifeq ($(MACH), aarch64) ifeq ($(MACH), aarch64)
e2e-out = collector/fixtures/e2e-64k-page-output.txt e2e-out = $(e2e-out-64k-page)
endif endif
# 64bit -> 32bit mapping for cross-checking. At least for amd64/386, the 64bit CPU can execute 32bit code but not the other way around, so we don't support cross-testing upwards. # 64bit -> 32bit mapping for cross-checking. At least for amd64/386, the 64bit CPU can execute 32bit code but not the other way around, so we don't support cross-testing upwards.
@ -123,6 +124,7 @@ skip-test-e2e:
checkmetrics: $(PROMTOOL) checkmetrics: $(PROMTOOL)
@echo ">> checking metrics for correctness" @echo ">> checking metrics for correctness"
./checkmetrics.sh $(PROMTOOL) $(e2e-out) ./checkmetrics.sh $(PROMTOOL) $(e2e-out)
./checkmetrics.sh $(PROMTOOL) $(e2e-out-64k-page)
.PHONY: checkrules .PHONY: checkrules
checkrules: $(PROMTOOL) checkrules: $(PROMTOOL)