зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1065180, part 2 - Switch existing code from the environment object to the new os.getenv() function. r=sfink.
--HG-- extra : rebase_source : 650884862d5f6c9aef2505c0886e7a30e2eb2c6a
This commit is contained in:
Родитель
622c1fc9bd
Коммит
523d6ecead
|
@ -6,7 +6,7 @@ loadRelativeToScript('utility.js');
|
|||
loadRelativeToScript('annotations.js');
|
||||
loadRelativeToScript('CFG.js');
|
||||
|
||||
var sourceRoot = (environment['SOURCE'] || '') + '/'
|
||||
var sourceRoot = (os.getenv('SOURCE') || '') + '/'
|
||||
|
||||
var functionBodies;
|
||||
|
||||
|
|
|
@ -135,7 +135,7 @@ function readable(fullname)
|
|||
|
||||
function xdbLibrary()
|
||||
{
|
||||
var lib = ctypes.open(environment['XDB']);
|
||||
var lib = ctypes.open(os.getenv('XDB'));
|
||||
return {
|
||||
open: lib.declare("xdb_open", ctypes.default_abi, ctypes.void_t, ctypes.char.ptr),
|
||||
min_data_stream: lib.declare("xdb_min_data_stream", ctypes.default_abi, ctypes.int),
|
||||
|
|
|
@ -46,7 +46,8 @@ assertEq(loadRel['local.js'], true);
|
|||
assertEq(loadRel['../basic/local.js'], true);
|
||||
assertEq(snarfRel['local.js'], true);
|
||||
assertEq(snarfRel['../basic/local.js'], true);
|
||||
if (('PWD' in environment) && !(/test.*[\/\\]basic[\/\\]/.test(environment['PWD']))) {
|
||||
var cwd = os.getenv('PWD');
|
||||
if (cwd !== undefined && !(/test.*[\/\\]basic[\/\\]/.test(cwd))) {
|
||||
assertEq(loaded['local.js'], false);
|
||||
assertEq(loaded['../basic/local.js'], false);
|
||||
assertEq(snarfed['local.js'], false);
|
||||
|
|
Загрузка…
Ссылка в новой задаче