diff --git a/Makefile b/Makefile index 0e4b2f42..031698e1 100644 --- a/Makefile +++ b/Makefile @@ -49,10 +49,12 @@ else test-e2e := skip-test-e2e endif +e2e-out = collector/fixtures/e2e-output.txt ifeq ($(MACH), ppc64le) - e2e-out = collector/fixtures/e2e-ppc64le-output.txt -else - e2e-out = collector/fixtures/e2e-output.txt + e2e-out = collector/fixtures/e2e-64k-page-output.txt +endif +ifeq ($(MACH), aarch64) + e2e-out = collector/fixtures/e2e-64k-page-output.txt 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. @@ -68,7 +70,6 @@ endef # By default, "cross" test with ourselves to cover unknown pairings. $(eval $(call goarch_pair,amd64,386)) -$(eval $(call goarch_pair,arm64,arm)) $(eval $(call goarch_pair,mips64,mips)) $(eval $(call goarch_pair,mips64el,mipsel)) diff --git a/collector/fixtures/e2e-ppc64le-output.txt b/collector/fixtures/e2e-64k-page-output.txt similarity index 100% rename from collector/fixtures/e2e-ppc64le-output.txt rename to collector/fixtures/e2e-64k-page-output.txt diff --git a/end-to-end-test.sh b/end-to-end-test.sh index 152aa981..ec99cae5 100755 --- a/end-to-end-test.sh +++ b/end-to-end-test.sh @@ -55,7 +55,7 @@ skip_re="^(go_|node_exporter_build_info|node_scrape_collector_duration_seconds|p arch="$(uname -m)" 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' ;; esac