Skip to content
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.

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

configure: fix type of arm_version #14595

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -773,16 +773,16 @@ def configure_arm(o):

if is_arch_armv7():
arm_fpu = 'vfpv3'
o['variables']['arm_version'] = '7'
o['variables']['arm_version'] = 7
else:
o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default'
o['variables']['arm_version'] = 6 if is_arch_armv6() else 'default'

o['variables']['arm_thumb'] = 0 # -marm
o['variables']['arm_float_abi'] = arm_float_abi

if options.dest_os == 'android':
arm_fpu = 'vfpv3'
o['variables']['arm_version'] = '7'
o['variables']['arm_version'] = 7

o['variables']['arm_fpu'] = options.arm_fpu or arm_fpu

Expand Down
4 changes: 2 additions & 2 deletions test/common/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@ exports.platformTimeout = function(ms) {

const armv = process.config.variables.arm_version;

if (armv === '6')
if (armv === 6)
return 7 * ms; // ARMv6

if (armv === '7')
if (armv === 7)
return 2 * ms; // ARMv7

return ms; // ARMv8+
Expand Down
4 changes: 2 additions & 2 deletions test/sequential/test-child-process-pass-fd.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
const common = require('../common');
if ((process.config.variables.arm_version === '6') ||
(process.config.variables.arm_version === '7'))
if ((process.config.variables.arm_version === 6) ||
(process.config.variables.arm_version === 7))
common.skip('Too slow for armv6 and armv7 bots');

const assert = require('assert');
Expand Down