Skip to content

Commit 6d65b65

Browse files
linevlinev
committed
[cef] adjust stressGraphics
On docker platforms CEF has limited resources, so reduce number of generated images when running with cef Also adjust some ref values while CEF on opensuse16 docker has more variations
1 parent ec9d8ad commit 6d65b65

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

‎test/stressGraphics.cxx‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -566,15 +566,20 @@ void webcanv_batch_mode(int number)
566566
/// Starts new block of tests
567567
/// In web mode configure number of batch images
568568

569-
void start_block(const TString &title)
569+
void start_block(const TString &title, bool is3d = false)
570570
{
571571
if (!gOptionR) {
572572
std::cout << "**********************************************************************\n";
573573
std::cout << "* Starting " << title << " - S T R E S S " << TString(' ', 41 - title.Length()) << " *\n";
574574
std::cout << "**********************************************************************\n";
575575
}
576576

577-
webcanv_batch_mode(80);
577+
int batch_size = 80;
578+
// cef makes problem with many images in 3D mode, so reduce it
579+
if (is3d && TString("cef") == gROOT->GetWebDisplay())
580+
batch_size = 10;
581+
582+
webcanv_batch_mode(batch_size);
578583
}
579584

580585
////////////////////////////////////////////////////////////////////////////////
@@ -4647,7 +4652,7 @@ void stressGraphics(Int_t verbose = 0, Bool_t generate = kFALSE, Bool_t keep_fil
46474652
graphpolar ();
46484653
print_reports ();
46494654

4650-
start_block("High Level 3D Primitives");
4655+
start_block("High Level 3D Primitives", true);
46514656
options2d1 ();
46524657
options2d2 ();
46534658
options2d3 ();

‎test/stressGraphics_web.ref‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
ttext2 577 50 3642 50 16539 6033 13079 6000 577 50
1212
tlatex0 12533 60 19680 70 170000 60000 185000 65000 12533 60
1313
tlatex1 6585 50 10186 50 37509 9184 34969 7388 6585 50
14-
tlatex2 4760 50 9867 62 44760 8732 30329 7888 4760 50
14+
tlatex2 4760 50 9867 62 44760 8732 32000 10000 4760 50
1515
tlatex3 9971 50 18489 50 44087 8064 32000 10000 9971 50
16-
tlatex4 20678 50 15186 50 72078 10677 45000 30000 20678 50
17-
tlatex5 31915 50 21579 50 98532 11922 102142 33853 31915 50
16+
tlatex4 20678 50 15186 50 72078 10677 55000 40000 20678 50
17+
tlatex5 31915 50 21579 50 105000 20000 102142 33853 31915 50
1818
kerning 13535 50 12671 50 179782 31960 66694 28160 13535 50
1919
itbf 4538 50 9061 70 45280 8144 39000 14000 4538 50
2020
tmathtext 109566 50 387050 100 76838 7616 62298 28760 109921 50
2121
transparency 1781 50 6264 100 41491 15000 75006 25000 1781 50
22-
transpad 9893 50 18592 84 63022 16300 40204 15625 9555 100
22+
transpad 9893 50 18650 150 63022 16300 40204 15625 9555 100
2323
statfitparam 34595 67 47449 2367 110520 19707 58703 18882 34600 100
24-
tgaxis1 18061 50 35587 173 67725 8774 36566 15109 18061 50
24+
tgaxis1 18061 50 35587 173 67725 8774 38000 18000 18061 50
2525
tgaxis2 13608 50 28297 184 63580 9566 44000 14000 13608 50
2626
tgaxis3 17470 50 42002 523 115108 33410 66220 10768 17473 50
27-
tgaxis4 4442 50 9627 84 40009 8482 31730 8009 4445 50
27+
tgaxis4 4550 200 9720 200 40009 8482 31730 8009 4550 200
2828
tgaxis5 14297 200 14920 173 190869 50682 72947 38985 14297 200
2929
tgaxis6 5021 190 10944 173 45000 11000 37464 7000 5021 290
3030
padticks 22245 200 37300 700 71900 30000 58600 20000 22245 200
@@ -66,7 +66,7 @@
6666
tgraph2d2 177243 181081 589798 763841 153361 113920 176486 26369 177099 181080
6767
tgraph2derr 113277 50000 1099040 763841 85018 40000 79189 20000 113277 50000
6868
tgraph2dassym 106676 50000 1099035 763841 80483 40000 74371 20000 106676 50000
69-
tprofile3d 51076 20000 1062206 500000 73964 35000 50008 15000 51072 20000
69+
tprofile3d 51076 20000 1062206 500000 73964 35000 53000 18000 51072 20000
7070
tf3 86268 20000 1099059 500000 100000 50000 68806 17000 86268 20000
7171
basic3d 18981 10000 573339 300000 40000 20000 30328 15000 18981 10000
7272
annotation3d 114858 40000 731079 200000 128048 50000 156824 50000 115254 40000

0 commit comments

Comments
 (0)