Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 280f266

Browse files
obastemurchakrabot
authored andcommitted
deps: update ChakraCore to chakra-core/ChakraCore@86e6e5cbe9
[1.8>1.9] [MERGE #4640 @obastemur] stack/error: disable it partially for xplat CI Merge pull request #4640 from obastemur:dis_stack_test_xp_ci_partially reduces test run time to 1/3 I've got bunch of CI failures due to this test is timing out (xplat). disabling a part of it helps to save it from whole run is going timeout. I did look into the details and saw `interlocked_increment` was playing a big role on the timeout. CH loses its' share from OS scheduler.. If CI machine is busy, it takes UNKNOWN amount of time for VM to get back the share needed.. well it loses again very soon because of the same reason. So, I won't add (todo, enable this) or open an issue to track this. Also, see the comments on the test file. Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>
1 parent 59f2d51 commit 280f266

File tree

1 file changed

+28
-22
lines changed

1 file changed

+28
-22
lines changed

deps/chakrashim/core/test/Error/stack.js

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ function printError(e) {
1010
}
1111

1212
var isMac = (WScript.Platform && WScript.Platform.OS == 'darwin');
13+
var isWin = (WScript.Platform && WScript.Platform.OS == 'win32');
1314

1415
var expects = [
1516
'#1', // 0
@@ -20,16 +21,21 @@ var expects = [
2021
'Error: Out of stack space',
2122
'#3', // 6
2223
'In finally',
23-
'Error: Out of stack space', // 8
24-
'testing stack overflow handling with catch block',
25-
'Error: Out of stack space', // 10
26-
'testing stack overflow handling with finally block',
27-
'Error: Out of stack space' ]; // 12
24+
'Error: Out of stack space' // 8
25+
];
26+
27+
if (isWin) {
28+
expects.push('testing stack overflow handling with catch block'); // 9
29+
expects.push('Error: Out of stack space'); // 10
30+
}
31+
32+
expects.push('testing stack overflow handling with finally block'); // 11
33+
expects.push('Error: Out of stack space'); // 12
2834

2935
if (!isMac) // last test (sometimes) we hit timeout before we hit stackoverflow.
30-
expects.push('Error: Out of stack space')
36+
expects.push('Error: Out of stack space'); // 13
3137

32-
expects.push('END');
38+
expects.push('END'); // 14
3339

3440
var index = 0;
3541
function printLog(str) {
@@ -56,23 +62,23 @@ for (var i = 1; i < 4; i++) {
5662
}
5763
}
5864

59-
printLog("testing stack overflow handling with catch block");
60-
try {
61-
function stackOverFlowCatch() {
62-
try {
63-
stackOverFlowCatch();
64-
while (true) {
65+
if (isWin) { // xplat CI timeouts (it doesn't st. overflows as soon as Windows does)
66+
printLog("testing stack overflow handling with catch block");
67+
try {
68+
function stackOverFlowCatch() {
69+
try {
70+
stackOverFlowCatch();
71+
while (true) { }
72+
}
73+
catch (e) {
74+
throw e;
6575
}
66-
67-
}
68-
catch (e) {
69-
throw e;
7076
}
77+
stackOverFlowCatch();
78+
}
79+
catch (e) {
80+
printLog(e);
7181
}
72-
stackOverFlowCatch();
73-
}
74-
catch (e) {
75-
printLog(e);
7682
}
7783

7884
printLog("testing stack overflow handling with finally block");
@@ -122,4 +128,4 @@ if (!isMac) {
122128

123129
printLog('END'); // do not remove this
124130

125-
WScript.Echo("Pass");
131+
WScript.Echo("Pass");

0 commit comments

Comments
 (0)