Skip to content

test: increase timeouts on arm #1366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
silverwind wants to merge 6 commits into from
Closed

test: increase timeouts on arm #1366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8855832
test - increase timeouts on ARM
silverwind Apr 7, 2015
0c2210b
Increase timeout in test-child-process-fork-net2
silverwind Apr 8, 2015
30a1882
Simplify arch check, style
silverwind Apr 8, 2015
77f952c
Add a super-slow test mode for armv6
silverwind Apr 8, 2015
e4a5192
Fix syntax
silverwind Apr 8, 2015
d577d19
process.arch
silverwind Apr 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify arch check, style
  • Loading branch information
@silverwind
silverwind committed Apr 8, 2015
commit 30a1882785df1339c684895a57df4c0fc9216713
30 changes: 5 additions & 25 deletions test/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var path = require('path');
var fs = require('fs');
var assert = require('assert');
Expand Down Expand Up @@ -181,32 +179,14 @@ exports.spawnPwd = function(options) {
}
};

const PLATFORM_TIMOUT_FACTORS = {
armv6: 6.0,
armv7: 2.0
};

exports.platformTimeout = function (ms) {
if (process.arch !== 'arm')
exports.platformTimeout = function(ms) {
if (process.platform !== 'arm')
return ms;

let cpuinfo;
if (process.config.variables.arm_version === '6')
return 6 * ms; // ARMv6

// arm version detection based on v8
try {
cpuinfo = fs.readFileSync('/proc/cpuinfo').toString();
} catch (e) {
return ms;
}

if (/\nCPU architecture:\s7\n/.test(cpuinfo)) {
return ms * PLATFORM_TIMOUT_FACTORS[/\(v6l\)/.test(cpuinfo) ?
'armv6' : 'armv7'];
} else if (/\nCPU architecture:\s6\n/.test(cpuinfo)) {
return ms * PLATFORM_TIMOUT_FACTORS['armv6'];
} else {
return ms;
}
return 2 * ms; // ARMv7 and up.
};
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Apr 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there's an easier way:

exports.platformTimeout = function(ms) {
  if (process.platform !== 'arm')
    return ms;

  // arm_version is a stringified number or 'default'
  if (process.config.variables.arm_version === '6')
    return 6 * ms;  // ARMv6

  return 2 * ms;  // ARMv7 and up.
};

Copy link
Copy Markdown
Contributor Author

@silverwind silverwind Apr 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's pretty convenient. Didn't know about these variables.


var knownGlobals = [setTimeout,
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-wrap-timeout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var server = tls.createServer(options, function(c) {

server.listen(common.PORT, function() {
var socket = net.connect(common.PORT, function() {
socket.setTimeout(common.platformTimeout(240), function () {
socket.setTimeout(common.platformTimeout(240), function() {
throw new Error('timeout');
});

Expand Down