summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@google.com>2023-12-22 17:59:19 -0500
committerGravatar Benjamin Barenblat <bbaren@google.com>2023-12-22 17:59:19 -0500
commitcd9fc91c8c4c5190c5c9b220706be7f69ce75e39 (patch)
treee8522b02c8aba65b46a4b19c5559c8648c026868
parent0bde25d627a78db1eef850962134e29c70e97708 (diff)
riscv64: disable some log_format_tests that have false positives20230802.1-2
Don’t require that Abseil logging produce the same rendering for a -nan float as libstdc++ does, since libstdc++’s rendering is optimization-dependent. See https://bugs.debian.org/1059340.
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/riscv-nan-formatting.diff20
-rw-r--r--debian/patches/series1
3 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ec2aee05..7c68791d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+abseil (20230802.1-2) experimental; urgency=medium
+
+ * Disable a unit test to work around https://bugs.debian.org/1059340.
+
+ -- Benjamin Barenblat <bbaren@debian.org> Fri, 22 Dec 2023 15:46:28 -0500
+
abseil (20230802.1-1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/patches/riscv-nan-formatting.diff b/debian/patches/riscv-nan-formatting.diff
new file mode 100644
index 00000000..8ad9b629
--- /dev/null
+++ b/debian/patches/riscv-nan-formatting.diff
@@ -0,0 +1,20 @@
+From: Benjamin Barenblat <bbaren@google.com>
+Subject: riscv64: Disable negative NaN float ostream format checking
+Bug-Debian: https://bugs.debian.org/1059340
+
+Streaming a negative NaN float with libstdc++ on riscv64 produces an
+optimization-dependent result. Don't require that logging such a float with
+Abseil produce the same result as libstdc++ streaming.
+
+--- a/absl/log/log_format_test.cc
++++ b/absl/log/log_format_test.cc
+@@ -611,7 +611,9 @@
+ EXPECT_CALL(
+ test_sink,
+ Send(AllOf(
++#ifndef __riscv // see https://bugs.debian.org/1059340
+ TextMessage(MatchesOstream(comparison_stream)),
++#endif
+ TextMessage(AnyOf(Eq("-nan"), Eq("nan"), Eq("NaN"), Eq("-nan(ind)"))),
+ ENCODED_MESSAGE(
+ AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"),
diff --git a/debian/patches/series b/debian/patches/series
index 29630f3c..397734ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ latomic.diff
empty-flags-library.diff
cordz-info-statistics-test.diff
pkg-config-directives.diff
+riscv-nan-formatting.diff