Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 102 insertions, 46 deletions

diff --git a/test/lisp/international/ucs-normalize-tests.el b/test/lisp/international/ucs-normalize-tests.el
index 51f4ed3a80e..eb577b97dc4 100644
--- a/test/lisp/international/ucs-normalize-tests.el
+++ b/test/lisp/international/ucs-normalize-tests.el
@@ -123,9 +123,9 @@ The following invariants must be true for all conformant implementations..."
 
 (defsubst ucs-normalize-tests--rule2-holds-p (X)
  "Check 2nd conformance rule.
-For every code point X assigned in this version of Unicode that is not specifically
-listed in Part 1, the following invariants must be true for all conformant
-implementations:
+For every code point X assigned in this version of Unicode that
+is not specifically listed in Part 1, the following invariants
+must be true for all conformant implementations:
 
   X == toNFC(X) == toNFD(X) == toNFKC(X) == toNFKD(X)"
  (and (ucs-normalize-tests--normalization-chareq-p NFC X X)
@@ -181,27 +181,34 @@ implementations:
   (should-not (ucs-normalize-tests--rule1-failing-for-partX 0)))
 
 (defconst ucs-normalize-tests--failing-lines-part1
-  (list 2152 2418 15133 15134 15135 15136 15137 15138
-        15139 15140 15141 15142 16152 16153 16154 16155
-        16156 16157 16158 16159 16160 16161 16162 16163
-        16164 16165 16166 16167 16168 16169 16170 16171
-        16172 16173 16174 16175 16176 16177 16178 16179
-        16180 16181 16182 16183 16184 16185 16186 16187
-        16188 16189 16190 16191 16192 16193 16194 16195
-        16196 16197 16198 16199 16200 16201 16202 16203
-        16204 16205 16206 16207 16208 16209 16210 16211
-        16212 16213 16214 16215 16216 16217 16218 16219
-        16220 16221 16222 16223 16224 16225 16226 16227
-        16228 16229 16230 16231 16232 16233 16234 16235
-        16236 16237 16238 16239 16240 16241 16242 16243
-        16244 16245 16246 16247 16248 16249 16250 16251
-        16252 16253 16254 16255 16256 16257 16258 16259
-        16260 16261 16262 16263 16264 16265 16266 16267
-        16268 16269 16270 16271 16272 16273 16274 16275
-        16276 16277 16278 16279 16280 16281 16282 16283
-        16284 16285 16286 16287 16288 16289 16290 16291
-        16292 16429 16430 16431 16432 16433 16434 16435
-        16436 16437 16438))
+  (list 2412 2413 2414 15133 15134 15135 15136 15137
+        15138 15139 15140 15141 15142 15143 15144 15145
+        15146 15147 15148 15149 15150 15151 15152 15153
+        15154 15155 15156 15157 15158 15159 15160 15161
+        15162 15163 15164 15165 15166 15167 15168 15169
+        15170 15171 15172 15173 15174 15175 15176 15177
+        15178 15179 15180 15181 15182 15183 15184 15185
+        15186 15187 15188 15192 15193 15194 15195 15196
+        15197 15198 15199 15200 15201 16211 16212 16213
+        16214 16215 16216 16217 16218 16219 16220 16221
+        16222 16223 16224 16225 16226 16227 16228 16229
+        16230 16231 16232 16233 16234 16235 16236 16237
+        16238 16239 16240 16241 16242 16243 16244 16245
+        16246 16247 16248 16249 16250 16251 16252 16253
+        16254 16255 16256 16257 16258 16259 16260 16261
+        16262 16263 16264 16265 16266 16267 16268 16269
+        16270 16271 16272 16273 16274 16275 16276 16277
+        16278 16279 16280 16281 16282 16283 16284 16285
+        16286 16287 16288 16289 16290 16291 16292 16293
+        16294 16295 16296 16297 16298 16299 16300 16301
+        16302 16303 16304 16305 16306 16307 16308 16309
+        16310 16311 16312 16313 16314 16315 16316 16317
+        16318 16319 16320 16321 16322 16323 16324 16325
+        16326 16327 16328 16329 16330 16331 16332 16333
+        16334 16335 16336 16337 16338 16339 16340 16341
+        16342 16343 16344 16345 16346 16347 16348 16349
+        16350 16351 16488 16489 16490 16491 16492 16493
+        16494 16495 16496 16497))
 
 ;; Keep a record of failures, for consulting afterwards (the ert
 ;; backtrace only shows a truncated version of these lists).
@@ -233,6 +240,7 @@ implementations:
 
 (ert-deftest ucs-normalize-part1 ()
   :tags '(:expensive-test)
+  (skip-unless (not (getenv "EMACS_HYDRA_CI"))) ; SLOW ~ 1800s
   ;; This takes a long time, so make sure we're compiled.
   (dolist (fun '(ucs-normalize-tests--part1-rule2
                  ucs-normalize-tests--rule1-failing-for-partX
@@ -259,28 +267,76 @@ implementations:
     ucs-normalize-tests--failing-lines-part1)))
 
 (defconst ucs-normalize-tests--failing-lines-part2
-  (list 17634 17635 17646 17647 17652 17653 17656 17657
-        17660 17661 17672 17673 17750 17751 17832 17834
-        17836 17837 17862 17863 17868 17869 18222 18270
-        18271 18368 18370 18400 18401 18402 18404 18406
-        18408 18410 18412 18413 18414 18416 18417 18418
-        18420 18421 18422 18423 18424 18426 18427 18428
-        18429 18430 18432 18434 18436 18438 18440 18442
-        18444 18446 18448 18450 18452 18454 18456 18458
-        18459 18460 18462 18464 18465 18466 18468 18469
-        18470 18472 18474 18475 18476 18478 18480 18481
-        18482 18484 18486 18487 18488 18490 18492 18494
-        18496 18498 18499 18500 18502 18504 18506 18508
-        18510 18512 18514 18516 18518 18520 18522 18524
-        18526 18528 18530 18531 18532 18533 18534 18602
-        18604 18606 18608 18610 18612 18614 18616 18618
-        18620 18622 18624 18626 18628 18630 18632 18634
-        18636 18638 18640 18642 18644 18646 18648 18650
-        18652 18654 18656 18658 18660 18662 18664 18666
-        18668 18670 18672 18674 18676 18678 18680 18682
-        18684 18686 18688 18690 18692 18694 18696 18698
-        18700 18702 18704 18706 18708 18710 18712 18714
-        18716 18718 18720 18722 18724 18726 18727))
+  (list 17087 17088 17089 17090 17091 17092 17093 17094
+        17098 17099 17100 17101 17102 17103 17104 17105
+        17106 17107 17108 17113 17114 17115 17116 17117
+        17118 17119 17120 17125 17126 17127 17128 17129
+        17130 17131 17132 17133 17134 17135 17136 17137
+        17138 17139 17140 17141 17142 17143 17144 17145
+        17146 17157 17158 17159 17160 17161 17162 17163
+        17164 17185 17186 17187 17188 17189 17190 17197
+        17198 17199 17200 17207 17208 17209 17210 17211
+        17212 17213 17214 17219 17220 17221 17222 17275
+        17276 17285 17286 17295 17296 17309 17310 17311
+        17312 17313 17314 17315 17316 17317 17318 17319
+        17320 17325 17326 17373 17374 17419 17420 17421
+        17422 17433 17434 17439 17440 17465 17466 17473
+        17474 17479 17480 17485 17486 17491 17492 17497
+        17498 17499 17500 17501 17502 17505 17506 17507
+        17508 17511 17512 17519 17520 17523 17524 17527
+        17528 17531 17532 17551 17552 17555 17556 17599
+        17600 17601 17602 17603 17604 17605 17607 17608
+        17609 17610 17611 17612 17613 17615 17617 17619
+        17621 17623 17625 17627 17629 17631 17632 17633
+        17634 17635 17636 17637 17638 17639 17640 17669
+        17670 17675 17676 17681 17682 17689 17690 17691
+        17692 17693 17694 17707 17708 17713 17714 17715
+        17716 17727 17728 17733 17734 17739 17740 17745
+        17746 17749 17750 17753 17754 17759 17760 17767
+        17768 17807 17808 17809 17810 17811 17812 17813
+        17814 17816 17843 17844 17845 17846 17851 17852
+        17861 17875 17876 17879 17880 17899 17900 17911
+        17912 17913 17914 17915 17916 17917 17918 17919
+        17920 17921 17922 17927 17928 17929 17930 17931
+        17932 17933 17935 17937 17938 17939 17940 17941
+        17943 17945 17947 17949 17951 17952 17953 17955
+        17957 17959 17961 17962 17967 17968 17987 17988
+        17993 17994 18003 18004 18005 18006 18007 18008
+        18009 18010 18011 18012 18017 18018 18019 18020
+        18021 18022 18023 18024 18041 18042 18053 18054
+        18069 18070 18079 18080 18163 18164 18165 18166
+        18171 18172 18175 18176 18211 18212 18219 18220
+        18221 18222 18223 18224 18225 18226 18301 18302
+        18389 18390 18391 18392 18393 18394 18397 18398
+        18407 18408 18439 18440 18441 18442 18443 18444
+        18445 18446 18447 18448 18449 18450 18451 18452
+        18457 18458 18459 18460 18471 18472 18479 18480
+        18485 18486 18499 18500 18501 18502 18509 18510
+        18513 18514 18515 18516 18517 18518 18519 18520
+        18521 18523 18524 18525 18527 18528 18531 18537
+        18538 18539 18541 18543 18545 18547 18549 18550
+        18551 18553 18554 18555 18557 18558 18559 18560
+        18561 18563 18564 18565 18566 18567 18569 18571
+        18573 18575 18577 18579 18581 18583 18585 18587
+        18589 18591 18593 18595 18596 18597 18599 18601
+        18602 18603 18605 18606 18607 18609 18611 18612
+        18613 18615 18617 18618 18619 18621 18623 18624
+        18625 18627 18629 18631 18633 18635 18636 18637
+        18639 18641 18643 18645 18647 18649 18651 18653
+        18655 18657 18659 18661 18663 18665 18667 18668
+        18669 18670 18671 18674 18676 18686 18688 18690
+        18692 18694 18695 18696 18697 18698 18699 18700
+        18701 18702 18703 18704 18705 18706 18707 18708
+        18709 18710 18721 18722 18723 18724 18739 18741
+        18743 18745 18747 18749 18751 18753 18755 18757
+        18759 18761 18763 18765 18767 18769 18771 18773
+        18775 18777 18779 18781 18783 18785 18787 18789
+        18791 18793 18795 18797 18799 18801 18803 18805
+        18807 18809 18811 18813 18815 18817 18819 18821
+        18823 18825 18827 18829 18831 18833 18835 18837
+        18839 18840 18841 18842 18843 18844 18845 18846
+        18847 18848 18849 18850 18851 18852 18853 18855
+        18857 18859 18861 18863 18865 18866))
 
 (ert-deftest ucs-normalize-part2 ()
   :tags '(:expensive-test)