Merge ~liushuyu-011/ubuntu/+source/icu:ubuntu/devel into ubuntu/+source/icu:ubuntu/devel

[Zixing Liu]

This merge proposal adds a patch to disable float-point math tests in icu on i386 architecture.

Intel i386/486/586 x87 registers only have 80-bit precision, while the tests assume IEEE 754R 128-bit precision.

Note that this patch will not affect the situation when SSE math is
used. In this case, the macro added in this patch will correctly enable those
tests.

[Gianfranco Costamagna (costamagnagianfranco)]

Hello, I sponsored, but I fail to see a link to a failed build log, and to why this has regressed only now, and not before.

review: Approve

[Gianfranco Costamagna (costamagnagianfranco)]

https://launchpadlibrarian.net/685590866/buildlog_ubuntu-mantic-i386.icu_72.1-3ubuntu2_BUILDING.txt.gz

diff --git a/debian/changelog b/debian/changelog
index 08be3e9..fa26cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+icu (72.1-3ubuntu3) mantic; urgency=medium
+
+  * d/p/disable-precision-fpmath-tests-on-i386.patch: add a patch to disable
+    precision checking tests on i386 where an imprecise FPU hardware is used
+
+ -- Zixing Liu <[e-mail]>  Thu, 14 Sep 2023 15:01:17 -0600
+
 icu (72.1-3ubuntu2) lunar; urgency=medium
 
   * d/p/test-canonical-ids.patch: update TestCanonicalIDs to match latest
diff --git a/debian/patches/disable-precision-fpmath-tests-on-i386.patch b/debian/patches/disable-precision-fpmath-tests-on-i386.patch
new file mode 100644
index 0000000..8cc6803
--- /dev/null
+++ b/debian/patches/disable-precision-fpmath-tests-on-i386.patch
@@ -0,0 +1,123 @@
+Description: Disable fpmath tests on i386
+ Intel i386/486/586 x87 registers only have 80-bit precision,
+ while the tests assume IEEE 754R 128-bit precision.
+ We have to disable those tests due to no alternative workaround
+ is available.
+Author: Zixing Liu <[e-mail]>
+Forwarded: no
+Last-Update: 2023-09-14
+
+Index: icu/source/test/intltest/dcfmapts.cpp
+===================================================================
+--- icu.orig/source/test/intltest/dcfmapts.cpp
++++ icu/source/test/intltest/dcfmapts.cpp
+@@ -861,8 +861,10 @@ void IntlTestDecimalFormatAPI::TestFixed
+     df->formatToDecimalQuantity(fable, fd, status);
+     assertSuccess(WHERE, status);
+     ASSERT_EQUAL(22, fd.getPluralOperand(PLURAL_OPERAND_V));
++#ifndef UPRV_IMPRECISE_FPMATH
+     ASSERT_EQUAL(3456789012345678900LL, fd.getPluralOperand(PLURAL_OPERAND_F));
+     ASSERT_EQUAL(34567890123456789LL, fd.getPluralOperand(PLURAL_OPERAND_T));
++#endif
+     ASSERT_EQUAL(12, fd.getPluralOperand(PLURAL_OPERAND_I));
+     ASSERT_EQUAL(false, fd.hasIntegerValue());
+     ASSERT_EQUAL(false, fd.isNegative());
+@@ -873,9 +875,11 @@ void IntlTestDecimalFormatAPI::TestFixed
+     df->formatToDecimalQuantity(fable, fd, status);
+     assertSuccess(WHERE, status);
+     ASSERT_EQUAL(22, fd.getPluralOperand(PLURAL_OPERAND_V));
++#ifndef UPRV_IMPRECISE_FPMATH
+     ASSERT_EQUAL(1234567890123456789LL, fd.getPluralOperand(PLURAL_OPERAND_F));
+     ASSERT_EQUAL(1234567890123456789LL, fd.getPluralOperand(PLURAL_OPERAND_T));
+     ASSERT_EQUAL(345678901234567890LL, fd.getPluralOperand(PLURAL_OPERAND_I));
++#endif
+     ASSERT_EQUAL(false, fd.hasIntegerValue());
+     ASSERT_EQUAL(false, fd.isNegative());
+ 
+@@ -968,9 +972,11 @@ void IntlTestDecimalFormatAPI::TestFixed
+     ASSERT_EQUAL(2, fd.getPluralOperand(PLURAL_OPERAND_V));
+     ASSERT_EQUAL(0, fd.getPluralOperand(PLURAL_OPERAND_F));
+     ASSERT_EQUAL(0, fd.getPluralOperand(PLURAL_OPERAND_T));
++#ifndef UPRV_IMPRECISE_FPMATH
+     // note: going through DigitList path to FixedDecimal, which is trimming
+     //       int64_t fields to 18 digits. See ticket Ticket #10374
+     ASSERT_EQUAL(223372036854775807LL, fd.getPluralOperand(PLURAL_OPERAND_I));
++#endif
+     ASSERT_EQUAL(true, fd.hasIntegerValue());
+     ASSERT_EQUAL(false, fd.isNegative());
+ 
+Index: icu/source/test/intltest/intltest.h
+===================================================================
+--- icu.orig/source/test/intltest/intltest.h
++++ icu/source/test/intltest/intltest.h
+@@ -29,6 +29,10 @@ U_NAMESPACE_USE
+ #pragma map(IntlTest::log( const UnicodeString &message ),"logos390")
+ #endif
+ 
++#if defined(__i386) && __SIZEOF_FLOAT80__ < 16
++#define UPRV_IMPRECISE_FPMATH 1
++#endif
++
+ //-----------------------------------------------------------------------------
+ //convenience classes to ease porting code that uses the Java
+ //string-concatenation operator (moved from findword test by rtg)
+Index: icu/source/test/intltest/msfmrgts.cpp
+===================================================================
+--- icu.orig/source/test/intltest/msfmrgts.cpp
++++ icu/source/test/intltest/msfmrgts.cpp
+@@ -773,9 +773,11 @@ void MessageFormatRegressionTest::Test41
+     // newobjs now equals {new Double(3.1)}
+     if (newobjs == NULL) {
+         dataerrln("Error calling MessageFormat::parse");
++#ifndef UPRV_IMPRECISE_FPMATH
+     } else {
+         if (newobjs[0].getDouble() != 3.1)
+             errln( UnicodeString("newobjs[0] = ") + newobjs[0].getDouble());
++#endif
+     }
+ 
+     delete [] objs;
+Index: icu/source/test/intltest/numbertest_api.cpp
+===================================================================
+--- icu.orig/source/test/intltest/numbertest_api.cpp
++++ icu/source/test/intltest/numbertest_api.cpp
+@@ -3819,9 +3819,11 @@ void NumberFormatterApiTest::roundingInc
+                 // Precision::increment(5.00000).withMinFraction(2) 'precision-increment/5.00'
+                 // ...
+ 
++#ifndef UPRV_IMPRECISE_FPMATH
+                 char expected[256];
+                 snprintf(expected, 256, pattern, increment);
+                 assertEquals(message, expected, skeleton.c_str());
++#endif
+             }
+         }
+     }
+Index: icu/source/test/intltest/numfmtst.cpp
+===================================================================
+--- icu.orig/source/test/intltest/numfmtst.cpp
++++ icu/source/test/intltest/numfmtst.cpp
+@@ -147,7 +147,9 @@ void NumberFormatTest::runIndexedTest( i
+   TESTCASE_AUTO(TestNumberingSystems);
+   TESTCASE_AUTO(TestSpaceParsing);
+   TESTCASE_AUTO(TestMultiCurrencySign);
++#ifndef UPRV_IMPRECISE_FPMATH
+   TESTCASE_AUTO(TestCurrencyFormatForMixParsing);
++#endif
+   TESTCASE_AUTO(TestMismatchedCurrencyFormatFail);
+   TESTCASE_AUTO(TestDecimalFormatCurrencyParse);
+   TESTCASE_AUTO(TestCurrencyIsoPluralFormat);
+Index: icu/source/test/intltest/numrgts.cpp
+===================================================================
+--- icu.orig/source/test/intltest/numrgts.cpp
++++ icu/source/test/intltest/numrgts.cpp
+@@ -2634,6 +2634,9 @@ void NumberFormatRegressionTest::Test424
+     if (failure(status, "DecimalFormat ct", Locale::getUS())) {
+         return;
+     }
++#ifdef UPRV_IMPRECISE_FPMATH
++    return;
++#endif
+ 
+     UnicodeString str;
+     FieldPosition pos;
diff --git a/debian/patches/series b/debian/patches/series
index 3051e6f..7834df1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 icudata-stdlibs.patch
 ICU-22198.patch
 test-canonical-ids.patch
+disable-precision-fpmath-tests-on-i386.patch