RepoMirrors
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A couple of ARM64-related fixes (#934) 

* Do not rely on AArch64 CPUs to support 32-bit ARM for cross-testing.

Signed-off-by: Alexey Kopytov <akopytov@gmail.com>

* aarch64 like ppc64le reports 64k node_sockstat_TCP_mem_bytes due to 64k pages.

Signed-off-by: Alexey Kopytov <akopytov@gmail.com>
This commit is contained in:
Alexey Kopytov 2018-05-14 16:55:49 +03:00 committed by Johannes 'fish' Ziemke
parent 84dc362b05
commit dd98a09bb2
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -49,10 +49,12 @@ else
test-e2e := skip-test-e2e test-e2e := skip-test-e2e
endif endif
ifeq ($(MACH), ppc64le)
e2e-out = collector/fixtures/e2e-ppc64le-output.txt
else
e2e-out = collector/fixtures/e2e-output.txt e2e-out = collector/fixtures/e2e-output.txt
ifeq ($(MACH), ppc64le)
e2e-out = collector/fixtures/e2e-64k-page-output.txt
endif
ifeq ($(MACH), aarch64)
e2e-out = collector/fixtures/e2e-64k-page-output.txt
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.
@ -68,7 +70,6 @@ endef
# By default, "cross" test with ourselves to cover unknown pairings. # By default, "cross" test with ourselves to cover unknown pairings.
$(eval $(call goarch_pair,amd64,386)) $(eval $(call goarch_pair,amd64,386))
$(eval $(call goarch_pair,arm64,arm))
$(eval $(call goarch_pair,mips64,mips)) $(eval $(call goarch_pair,mips64,mips))
$(eval $(call goarch_pair,mips64el,mipsel)) $(eval $(call goarch_pair,mips64el,mipsel))

0
collector/fixtures/e2e-ppc64le-output.txt → collector/fixtures/e2e-64k-page-output.txt
View File

2
end-to-end-test.sh
View File

@ -55,7 +55,7 @@ skip_re="^(go_|node_exporter_build_info|node_scrape_collector_duration_seconds|p
arch="$(uname -m)" arch="$(uname -m)"
case "${arch}" in case "${arch}" in
ppc64le) fixture='collector/fixtures/e2e-ppc64le-output.txt' ;; aarch64|ppc64le) fixture='collector/fixtures/e2e-64k-page-output.txt' ;;
*) fixture='collector/fixtures/e2e-output.txt' ;; *) fixture='collector/fixtures/e2e-output.txt' ;;
esac esac