From 260fc202a1387cfc3f3ef756f584923ab5b0a198 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 21 Dec 2023 17:58:49 +0100
Subject: [PATCH] Adapt tests to work with zlib-ng
Fedora 40 has replaced zlib with a zlib compatible version of zlib-ng
---
test/stress.cxx | 2 +-
test/stressGraphics.ref | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/test/stress.cxx b/test/stress.cxx
index de8061a9fc..77f48d43b8 100644
--- a/test/stress.cxx
+++ b/test/stress.cxx
@@ -406,7 +406,7 @@ void stress3()
#else
constexpr Long64_t lastgood = 52090;
#endif
- constexpr Long64_t tolerance = 150;
+ constexpr Long64_t tolerance = 300;
#ifdef R__HAS_DEFAULT_LZ4
constexpr Long64_t difflastgoodlz4 = 5500;
if (last < lastgood - tolerance || last > lastgood + difflastgoodlz4 + tolerance || comp < 1.5 || comp > 2.1)
diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref
index 16d06e33fa..a21068927d 100644
--- a/test/stressGraphics.ref
+++ b/test/stressGraphics.ref
@@ -2,12 +2,12 @@ Test# PS1Ref# PS1Err# PDFRef# PDFErr# JPGRef# JPGErr# PNGRef# PN
1 529 50 12767 50 23848 3700 3937 100 569 60
2 4627 600 14506 100 13368 7900 9208 3000 4690 600
3 452 50 12694 50 11232 4200 3796 10700 492 50
- 4 23617 1500 19386 100 143320 123000 45665 11000 24908 1500
+ 4 23617 1500 19386 200 143320 123000 45665 11000 24908 1500
5 1025 150 12802 200 33468 9900 30846 5000 1072 200
6 430 50 12669 50 9558 100 5325 700 471 50
7 4980 50 13893 50 16143 1300 12230 500 5011 70
8 5442 80 13473 50 18430 700 12398 300 5469 80
- 9 9253 100 14377 50 19851 2400 12199 900 9449 100
+ 9 9253 100 14377 100 19851 2400 12199 900 9449 100
10 8863 70 13645 100 24343 1100 23278 1700 8894 70
11 12971 100 14444 50 34063 2000 32033 1200 12864 150
12 7674 100 13533 50 83557 3000 38505 4000 7720 150
@@ -15,30 +15,30 @@ Test# PS1Ref# PS1Err# PDFRef# PDFErr# JPGRef# JPGErr# PNGRef# PN
14 14190539 4000000 12926 100 23076 9500 25987 3000 14190704 4000000
15 15690 5000 17179 200 23076 9500 15202 900 10437 5000
16 28072 400 23287 200 44462 11000 30062 5000 38007 400
- 17 20444 400 21520 100 27511 11000 16867 600 20721 400
- 18 15894 100 19305 100 27187 10300 15925 350 15925 100
- 19 22521 300 42926 150 43868 17000 19232 11000 22729 300
+ 17 20444 400 21520 150 27511 11000 16867 600 20721 400
+ 18 15894 100 19305 200 27187 10300 15925 350 15925 100
+ 19 22521 300 42926 200 43868 17000 19232 11000 22729 300
20 3664 600 14437 100 19824 6300 10396 900 4220 600
21 17608 600 13900 150 49440 6300 37586 9000 5938 600
22 4866 600 14162 100 30889 10050 21311 1800 4845 600
- 23 4131 40 15272 50 34038 2500 12258 1400 4162 40
+ 23 4131 40 15272 100 34038 2500 12258 1400 4162 40
24 7813 300 23739 100 11085 6000 6973 3100 8081 300
25 28422 150 29391 300 14104 14800 7386 2800 14493 150
26 4545 150 14541 100 27602 14800 13094 2800 4467 150
27 6141 200 15967 100 39594 21600 19331 7000 6596 500
28 9110 500 16584 200 21346 21600 10645 7000 8869 500
29 7419 500 15112 200 18872 21600 7928 7000 7296 500
- 30 17016 5500 18198 100 32434 17400 22157 5000 20823 5500
- 31 30615 8200 27176 150 50520 18200 35724 5400 36690 8200
- 32 3304592 100 712308 500 62688 19000 123056 7000 0 0
+ 30 17016 5500 18198 250 32434 17400 22157 5000 20823 5500
+ 31 30615 8200 27176 200 50520 18200 35724 5400 36690 8200
+ 32 3304592 100 712308 3000 62688 19000 123056 7000 0 0
33 89233 500 47975 300 65532 27800 37314 12000 90600 500
34 36514 300 16815 200 47408 12700 33739 3700 36399 300
- 35 207729 750 87126 100 76094 38000 54717 11000 210497 800
- 36 401670 6500 156361 500 62719 34100 45592 14000 410114 6500
- 37 566142 5000 225206 750 65828 31800 53934 6500 573396 5000
- 38 3738751 35000 1292739 8000 60580 9900 133547 3500 3783013 35000
+ 35 207729 750 87126 750 76094 38000 54717 11000 210497 800
+ 36 401670 6500 156361 2000 62719 34100 45592 14000 410114 6500
+ 37 566142 5000 225206 2000 65828 31800 53934 6500 573396 5000
+ 38 3738751 35000 1292739 12000 60580 9900 133547 3500 3783013 35000
39 1466028 9000 853193 50000 38425 13500 91242 18100 1463263 7500
- 40 38312 200 56877 250 36524 11800 119641 8000 38121 200
+ 40 38312 200 56877 750 36524 11800 119641 8000 38121 200
41 15025 3000 29289 500 42525 11300 33336 3900 14787 4000
42 254604 5000 383258 7000 55666 30400 46534 6500 259594 7000
43 4846 150 14075 150 33239 600 25303 300 4877 150
--
2.43.0