diff --git a/armv7hl-disable-tests.patch b/armv7hl-disable-tests.patch deleted file mode 100644 index 2d869b1..0000000 --- a/armv7hl-disable-tests.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -ru orig.icu/source/test/cintltst/cnmdptst.c icu/source/test/cintltst/cnmdptst.c ---- orig.icu/source/test/cintltst/cnmdptst.c 2016-03-23 21:48:18.000000000 +0100 -+++ icu/source/test/cintltst/cnmdptst.c 2016-04-15 18:34:06.148251985 +0200 -@@ -186,6 +186,12 @@ - /* Test exponential pattern*/ - static void TestExponential(void) - { -+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */ -+#if 1 -+ /* Actually only 3 tests fail, but given the nested structure depending on -+ * array sizes there's no simple "disable this and that". */ -+ return; -+#endif - int32_t pat_length, val_length, lval_length; - int32_t ival, ilval, p, v, lneed; - UNumberFormat *fmt; -diff -ru orig.icu/source/test/intltest/dcfmtest.cpp icu/source/test/intltest/dcfmtest.cpp ---- orig.icu/source/test/intltest/dcfmtest.cpp 2016-03-23 21:48:38.000000000 +0100 -+++ icu/source/test/intltest/dcfmtest.cpp 2016-04-15 18:34:06.148251985 +0200 -@@ -279,6 +279,13 @@ - // - formatLineMat.reset(testLine); - if (formatLineMat.lookingAt(status)) { -+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */ -+#if 1 -+// [Formattable] file dcfmtest.txt, line 62: expected "12.35E5", got "1.235E6" -+// [StringPiece] file dcfmtest.txt, line 62: expected "12.35E5", got "1.235E6" -+ if (lineNum == 62) -+ continue; -+#endif - execFormatTest(lineNum, - formatLineMat.group(1, status), // Pattern - formatLineMat.group(2, status), // rounding mode -diff -ru orig.icu/source/test/intltest/numfmtspectest.cpp icu/source/test/intltest/numfmtspectest.cpp ---- orig.icu/source/test/intltest/numfmtspectest.cpp 2016-03-23 21:48:40.000000000 +0100 -+++ icu/source/test/intltest/numfmtspectest.cpp 2016-04-15 18:34:06.148251985 +0200 -@@ -137,11 +137,14 @@ - - void NumberFormatSpecificationTest::TestScientificNotation() { - assertPatternFr("1,23E4", 12345.0, "0.00E0", TRUE); -+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */ -+#if 0 - assertPatternFr("123,00E2", 12300.0, "000.00E0", TRUE); - assertPatternFr("123,0E2", 12300.0, "000.0#E0", TRUE); - assertPatternFr("123,0E2", 12300.1, "000.0#E0", TRUE); - assertPatternFr("123,01E2", 12301.0, "000.0#E0", TRUE); - assertPatternFr("123,01E+02", 12301.0, "000.0#E+00", TRUE); -+#endif - assertPatternFr("12,3E3", 12345.0, "##0.00E0", TRUE); - assertPatternFr("12,300E3", 12300.1, "##0.0000E0", TRUE); - assertPatternFr("12,30E3", 12300.1, "##0.000#E0", TRUE); -@@ -221,6 +224,8 @@ - assertEquals("", "USD (433.22)", result, TRUE); - } - } -+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */ -+#if 0 - const char *paddedSciPattern = "QU**00.#####E0"; - assertPatternFr("QU***43,3E-1", 4.33, paddedSciPattern, TRUE); - { -@@ -242,6 +247,7 @@ - } - // padding cannot work as intended with scientific notation. - assertPatternFr("QU**43,32E-1", 4.332, paddedSciPattern, TRUE); -+#endif - } - - void NumberFormatSpecificationTest::assertPatternFr( -diff -ru orig.icu/source/test/intltest/numfmtst.cpp icu/source/test/intltest/numfmtst.cpp ---- orig.icu/source/test/intltest/numfmtst.cpp 2016-03-23 21:48:40.000000000 +0100 -+++ icu/source/test/intltest/numfmtst.cpp 2016-04-15 18:34:06.150251997 +0200 -@@ -730,6 +730,12 @@ - void - NumberFormatTest::TestExponential(void) - { -+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */ -+#if 1 -+ /* Actually only 3 tests fail, but given the nested structure depending on -+ * array sizes there's no simple "disable this and that". */ -+ return; -+#endif - UErrorCode status = U_ZERO_ERROR; - DecimalFormatSymbols sym(Locale::getUS(), status); - if (U_FAILURE(status)) { errcheckln(status, "FAIL: Bad status returned by DecimalFormatSymbols ct - %s", u_errorName(status)); return; } -@@ -1846,8 +1852,11 @@ - (int32_t) 45678000, "5E7", status); - expect(new DecimalFormat("00E0", US, status), - (int32_t) 45678000, "46E6", status); -+/* erAck: fails on armv7hl, https://bugzilla.redhat.com/show_bug.cgi?id=1239574 */ -+#if 0 - expect(new DecimalFormat("000E0", US, status), - (int32_t) 45678000, "457E5", status); -+#endif - /* - expect(new DecimalFormat("###E0", US, status), - new Object[] { new Double(0.0000123), "12.3E-6", diff --git a/icu-config.sh b/icu-config.sh index 5779637..84d5adf 100644 --- a/icu-config.sh +++ b/icu-config.sh @@ -1,11 +1,2 @@ #!/bin/sh -OOO_ARCH=$(uname -m) -case $OOO_ARCH in - x86_64 | s390x | ppc64 | sparc64 | aarch64 | ppc64le | mips64 | mips64el | riscv64) - bits=64 - ;; - * ) - bits=32 - ;; -esac -exec icu-config-$bits "$@" +exec icu-config-64 "$@" diff --git a/icu.spec b/icu.spec index dfd0d53..0d77e46 100644 --- a/icu.spec +++ b/icu.spec @@ -10,11 +10,8 @@ Source1: icu-config.sh BuildRequires: gcc gcc-c++ doxygen autoconf python2 icu libicu-devel Requires: lib%{name} = %{version}-%{release} -Patch4: gennorm2-man.patch -Patch5: icuinfo-man.patch -%ifarch armv7hl -Patch100: armv7hl-disable-tests.patch -%endif +Patch1: gennorm2-man.patch +Patch2: icuinfo-man.patch %description Tools and utilities for developing with icu. @@ -89,10 +86,8 @@ make %{?_smp_mflags} -C source check pushd source LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l - %ldconfig_scriptlets libicu - %files %defattr(-,root,root) %license license.html LICENSE @@ -131,5 +126,11 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog +* Sat Jan 11 2020 openEuler Buildteam - 62.1-3 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:optimization the spec + * Fri Nov 1 2019 openEuler Buildteam - 62.1-2 - Package init