mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor: use env var to skip native module tests on win32/debug (#13890)

Browse source
This commit is contained in:
Jeremy Apthorp 2018-07-31 20:33:13 -07:00 • committed by Samuel Attard
parent 4990b3990b
commit a4f02724bf
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/test.py
View file

@ -55,6 +55,8 @@ def main():
electron = os.path.join(SOURCE_ROOT, 'out', config, electron = os.path.join(SOURCE_ROOT, 'out', config,
'{0}.exe'.format(PROJECT_NAME)) '{0}.exe'.format(PROJECT_NAME))
resources_path = os.path.join(SOURCE_ROOT, 'out', config) resources_path = os.path.join(SOURCE_ROOT, 'out', config)
if config != 'R':
os.environ['ELECTRON_SKIP_NATIVE_MODULE_TESTS'] = '1'
else: else:
electron = os.path.join(SOURCE_ROOT, 'out', config, PROJECT_NAME) electron = os.path.join(SOURCE_ROOT, 'out', config, PROJECT_NAME)
resources_path = os.path.join(SOURCE_ROOT, 'out', config) resources_path = os.path.join(SOURCE_ROOT, 'out', config)

2
spec/static/main.js
View file

@ -99,7 +99,7 @@ if (global.isCi) {
}) })
} }
global.nativeModulesEnabled = process.platform !== 'win32' || process.execPath.toLowerCase().indexOf('\\out\\d\\') === -1 global.nativeModulesEnabled = !process.env.ELECTRON_SKIP_NATIVE_MODULE_TESTS
// Register app as standard scheme. // Register app as standard scheme.
global.standardScheme = 'app' global.standardScheme = 'app'