aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/arm-multiarch.diff
diff options
context:
space:
mode:
authorBenjamin Barenblat <bbaren@google.com>2022-03-31 14:13:19 -0400
committerBenjamin Barenblat <bbaren@google.com>2022-03-31 14:13:19 -0400
commit33ef755be756c9699829f33e8ad2eb7072f810d0 (patch)
tree328c3b3fe0867db29926991ea9bc9cc1bcd1409e /debian/patches/arm-multiarch.diff
parent98c32dfeb7a0ad82925d2189f5a5af78f7832aa4 (diff)
downloadabseil-33ef755be756c9699829f33e8ad2eb7072f810d0.tar.gz
abseil-33ef755be756c9699829f33e8ad2eb7072f810d0.tar.bz2
abseil-33ef755be756c9699829f33e8ad2eb7072f810d0.zip
Disable NominalCPUFrequency tests
Upstream has decided NominalCPUFrequency is for internal consumption, so stop running its unit tests.
Diffstat (limited to 'debian/patches/arm-multiarch.diff')
-rw-r--r--debian/patches/arm-multiarch.diff25
1 files changed, 0 insertions, 25 deletions
diff --git a/debian/patches/arm-multiarch.diff b/debian/patches/arm-multiarch.diff
deleted file mode 100644
index c976f730..00000000
--- a/debian/patches/arm-multiarch.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Benjamin Barenblat <bbaren@google.com>
-Subject: Disable SysinfoTest.NominalCPUFrequency on armel/armhf
-
-NominalCPUFrequency has different behavior on 32-bit and 64-bit ARM
-kernels. The Debian arm64 buildds assume they can build 32-bit ARM
-packages, but if they do, the NominalCPUFrequency test will fail.
-Disable the test when building for 32-bit ARM.
-
---- a/absl/base/internal/sysinfo_test.cc
-+++ b/absl/base/internal/sysinfo_test.cc
-@@ -43,7 +43,13 @@
- // POWER is particularly problematic here; some Linux kernels expose the CPU
- // frequency, while others do not. Since we can't predict a priori what a given
- // machine is going to do, just disable this test on POWER on Linux.
-+//
-+// Debian also disables this test on armel and armhf, since tests for those
-+// platforms could either be run on a 32-bit ARM system (where
-+// NominalCPUFrequency returns a reasonable value) or a 64-bit ARM system (where
-+// it does not).
--#if !(defined(__linux) && (defined(__ppc64__) || defined(__PPC64__)))
-+#if !(defined(__linux) && \
-+ (defined(__ppc64__) || defined(__PPC64__) || defined(__arm__)))
- TEST(SysinfoTest, NominalCPUFrequency) {
- // Linux only exposes the CPU frequency on certain architectures, and
- // Emscripten doesn't expose it at all.