diff options
Diffstat (limited to 'debian/patches/disable-nominalcpufrequency-test.diff')
| -rw-r--r-- | debian/patches/disable-nominalcpufrequency-test.diff | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/debian/patches/disable-nominalcpufrequency-test.diff b/debian/patches/disable-nominalcpufrequency-test.diff new file mode 100644 index 00000000..dc15dc9e --- /dev/null +++ b/debian/patches/disable-nominalcpufrequency-test.diff @@ -0,0 +1,46 @@ +From: Derek Mauro <dmauro@google.com> +Subject: Remove the test for absl::base_internal::NominalCPUFrequency() from OSS code +Origin: upstream, https://github.com/abseil/abseil-cpp/commit/732b5580f089101ce4b8cdff55bb6461c59a6720 + +Remove the test for absl::base_internal::NominalCPUFrequency() from OSS code + +This is an internal-only function that should never by called by OSS code. +By its nature fails on unsupported platforms. +Google code has tests for this function on supported internal platforms. + +Fixes #1053 + +PiperOrigin-RevId: 408692861 + +--- a/absl/base/internal/sysinfo_test.cc ++++ b/absl/base/internal/sysinfo_test.cc +@@ -37,29 +37,6 @@ + << "NumCPUs() should not have the default value of 0"; + } + +-// Ensure that NominalCPUFrequency returns a reasonable value, or 1.00 on +-// platforms where the CPU frequency is not available through sysfs. +-// +-// 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. +-#if !(defined(__linux) && (defined(__ppc64__) || defined(__PPC64__))) +-TEST(SysinfoTest, NominalCPUFrequency) { +- // Linux only exposes the CPU frequency on certain architectures, and +- // Emscripten doesn't expose it at all. +-#if defined(__linux__) && \ +- (defined(__aarch64__) || defined(__hppa__) || defined(__mips__) || \ +- defined(__riscv) || defined(__s390x__)) || \ +- defined(__EMSCRIPTEN__) +- EXPECT_EQ(NominalCPUFrequency(), 1.0) +- << "CPU frequency detection was fixed! Please update unittest."; +-#else +- EXPECT_GE(NominalCPUFrequency(), 1000.0) +- << "NominalCPUFrequency() did not return a reasonable value"; +-#endif +-} +-#endif +- + TEST(SysinfoTest, GetTID) { + EXPECT_EQ(GetTID(), GetTID()); // Basic compile and equality test. + #ifdef __native_client__ |