Drop patch for armv7hl
This commit is contained in:
parent
90ddd348dd
commit
c43daf75e5
@ -1,19 +0,0 @@
|
|||||||
diff -up ./absl/base/internal/sysinfo_test.cc.armv7 ./absl/base/internal/sysinfo_test.cc
|
|
||||||
--- ./absl/base/internal/sysinfo_test.cc.armv7 2021-06-09 21:54:44.503755718 -0400
|
|
||||||
+++ ./absl/base/internal/sysinfo_test.cc 2021-06-09 22:56:14.459611843 -0400
|
|
||||||
@@ -43,13 +43,13 @@ TEST(SysinfoTest, NumCPUs) {
|
|
||||||
// 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__)))
|
|
||||||
+#if !(defined(__linux) && (defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) || defined(__arm__)))
|
|
||||||
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(__riscv) || defined(__s390x__)) || \
|
|
||||||
defined(__EMSCRIPTEN__)
|
|
||||||
EXPECT_EQ(NominalCPUFrequency(), 1.0)
|
|
||||||
<< "CPU frequency detection was fixed! Please update unittest.";
|
|
@ -10,14 +10,10 @@ License: ASL 2.0
|
|||||||
URL: https://abseil.io
|
URL: https://abseil.io
|
||||||
Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
# Disable CPU frequency detection on armv7hl architectures.
|
|
||||||
# Makes test consistent with aarch64 CPUs.
|
|
||||||
# Not submitted upstream.
|
|
||||||
Patch0: abseil-cpp-20210324.2-armv7.patch
|
|
||||||
# Remove test assertions that use ::testing::Conditional, which is not in a
|
# Remove test assertions that use ::testing::Conditional, which is not in a
|
||||||
# released version of GTest. Not submitted upstream, as this is a workaround
|
# released version of GTest. Not submitted upstream, as this is a workaround
|
||||||
# rather than a fix. https://github.com/abseil/abseil-cpp/issues/1063
|
# rather than a fix. https://github.com/abseil/abseil-cpp/issues/1063
|
||||||
Patch1: abseil-cpp-20211102.0-gtest-unreleased-features.patch
|
Patch0: abseil-cpp-20211102.0-gtest-unreleased-features.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
# The default make backend would work just as well; ninja is observably faster
|
# The default make backend would work just as well; ninja is observably faster
|
||||||
@ -142,6 +138,7 @@ sed -r -i 's/\bSymbolizeWithMultipleMaps\b/DISABLED_&/' \
|
|||||||
- Drop --output-on-failure, already in %%ctest expansion
|
- Drop --output-on-failure, already in %%ctest expansion
|
||||||
- On s390x, instead of ignoring all tests, skip only the single failing test
|
- On s390x, instead of ignoring all tests, skip only the single failing test
|
||||||
- Use ninja backend for CMake: speeds up build with no downsides
|
- Use ninja backend for CMake: speeds up build with no downsides
|
||||||
|
- Drop patch for armv7hl
|
||||||
|
|
||||||
* Mon Jan 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20210324.2-4
|
* Mon Jan 31 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 20210324.2-4
|
||||||
- Fix test failure (fix RHBZ#2045186)
|
- Fix test failure (fix RHBZ#2045186)
|
||||||
|
Loading…
Reference in New Issue
Block a user