diff options
| author | Alexey Kopytov <akopytov@gmail.com> | 2018-05-14 16:55:49 +0300 |
|---|---|---|
| committer | Johannes 'fish' Ziemke <github@freigeist.org> | 2018-05-14 15:55:49 +0200 |
| commit | dd98a09bb27b4eca4fd8c67189afbb5e0d8b2920 (patch) | |
| tree | f22c8669a47de50879005f0fe81b033c56ca2f22 /Makefile | |
| parent | 84dc362b05aeffecf2e8bc4541840e0744963060 (diff) | |
| download | prometheus_node_collector-dd98a09bb27b4eca4fd8c67189afbb5e0d8b2920.tar.bz2 prometheus_node_collector-dd98a09bb27b4eca4fd8c67189afbb5e0d8b2920.tar.xz prometheus_node_collector-dd98a09bb27b4eca4fd8c67189afbb5e0d8b2920.zip | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
| @@ -49,10 +49,12 @@ else | |||
| 49 | test-e2e := skip-test-e2e | 49 | test-e2e := skip-test-e2e |
| 50 | endif | 50 | endif |
| 51 | 51 | ||
| 52 | e2e-out = collector/fixtures/e2e-output.txt | ||
| 52 | ifeq ($(MACH), ppc64le) | 53 | ifeq ($(MACH), ppc64le) |
| 53 | e2e-out = collector/fixtures/e2e-ppc64le-output.txt | 54 | e2e-out = collector/fixtures/e2e-64k-page-output.txt |
| 54 | else | 55 | endif |
| 55 | e2e-out = collector/fixtures/e2e-output.txt | 56 | ifeq ($(MACH), aarch64) |
| 57 | e2e-out = collector/fixtures/e2e-64k-page-output.txt | ||
| 56 | endif | 58 | endif |
| 57 | 59 | ||
| 58 | # 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. | 60 | # 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 | |||
| 68 | 70 | ||
| 69 | # By default, "cross" test with ourselves to cover unknown pairings. | 71 | # By default, "cross" test with ourselves to cover unknown pairings. |
| 70 | $(eval $(call goarch_pair,amd64,386)) | 72 | $(eval $(call goarch_pair,amd64,386)) |
| 71 | $(eval $(call goarch_pair,arm64,arm)) | ||
| 72 | $(eval $(call goarch_pair,mips64,mips)) | 73 | $(eval $(call goarch_pair,mips64,mips)) |
| 73 | $(eval $(call goarch_pair,mips64el,mipsel)) | 74 | $(eval $(call goarch_pair,mips64el,mipsel)) |
| 74 | 75 | ||