[3.14] gh-130317: Fix SNaN broken tests on HP PA RISC (GH-140452) (#140467)

gh-130317: Fix SNaN broken tests on HP PA RISC (GH-140452)

While looking at GH-140028, I found some unrelated test regressions in the
3.14 cycle. These seem to all come from GH-130317. From what I can tell,
that made Python more correct than it was before. According to [0], HP PA
RISC uses 1 for SNaN and thus a 0 for QNaN.

[0]: https://grouper.ieee.org/groups/1788/email/msg03272.html
(cherry picked from commit 76fea5596c235a7853cda8df87c3998d506e950c)

Co-authored-by: Stefano Rivera <stefano@rivera.za.net>

diff --git a/Lib/test/test_capi/test_float.py b/Lib/test/test_capi/test_float.py
index f7efe0d02549a3b8a249fc71cc3002de47fad2f9..983b991b4f163d818d47c96bca36877c479a55da 100644 (file)
--- a/Lib/test/test_capi/test_float.py
+++ b/Lib/test/test_capi/test_float.py
@@ -1,5 +1,6 @@
 import math
 import random
+import platform
 import sys
 import unittest
 import warnings
@@ -197,6 +198,10 @@ class CAPIFloatTest(unittest.TestCase):
                     # PyFloat_Pack/Unpack*() API.  See also gh-130317 and
                     # e.g. https://developercommunity.visualstudio.com/t/155064
                     signaling = 0
+                    if platform.machine().startswith('parisc'):
+                        # HP PA RISC uses 0 for quiet, see:
+                        # https://en.wikipedia.org/wiki/NaN#Encoding
+                        signaling = 1
                 quiet = int(not signaling)
                 if size == 8:
                     payload = random.randint(signaling, 0x7ffffffffffff)

diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 7df01f28f09118ea99c82be581d864cbf13ccc53..75c76a36ee92f5d025487fe1ad477fc1b1b1e13a 100644 (file)
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -5,6 +5,7 @@ import gc
 import math
 import operator
 import unittest
+import platform
 import struct
 import sys
 import weakref
@@ -917,10 +918,17 @@ class UnpackIteratorTest(unittest.TestCase):
 
         # Check that packing produces a bit pattern representing a quiet NaN:
         # all exponent bits and the msb of the fraction should all be 1.
+        if platform.machine().startswith('parisc'):
+            # HP PA RISC uses 0 for quiet, see:
+            # https://en.wikipedia.org/wiki/NaN#Encoding
+            expected = 0x7c
+        else:
+            expected = 0x7e
+
         packed = struct.pack('<e', math.nan)
-        self.assertEqual(packed[1] & 0x7e, 0x7e)
+        self.assertEqual(packed[1] & 0x7e, expected)
         packed = struct.pack('<e', -math.nan)
-        self.assertEqual(packed[1] & 0x7e, 0x7e)
+        self.assertEqual(packed[1] & 0x7e, expected)
 
         # Checks for round-to-even behavior
         format_bits_float__rounding_list = [