diff options
author | Robert Kowalski <rok@kowalski.gd> | 2013-05-11 22:43:11 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-05-15 23:57:58 +0200 |
commit | 04ce80760ed615f353e128efa447cdf11fdb903f (patch) | |
tree | f0f01d388676918d65b18748f29422dfb7480aff | |
parent | 7124387b3414c41533078f14a84446e2e0a6ff95 (diff) | |
download | android-node-v8-04ce80760ed615f353e128efa447cdf11fdb903f.tar.gz android-node-v8-04ce80760ed615f353e128efa447cdf11fdb903f.tar.bz2 android-node-v8-04ce80760ed615f353e128efa447cdf11fdb903f.zip |
module: use path.sep instead of custom solution
Instead of using a custom solution for path delimiters we can use
path.sep in Module._initPaths
-rw-r--r-- | lib/module.js | 3 | ||||
-rw-r--r-- | test/simple/test-module-globalpaths-nodepath.js | 46 |
2 files changed, 47 insertions, 2 deletions
diff --git a/lib/module.js b/lib/module.js index 460d870e7e..54bd99a239 100644 --- a/lib/module.js +++ b/lib/module.js @@ -516,8 +516,7 @@ Module._initPaths = function() { } if (process.env['NODE_PATH']) { - var splitter = isWindows ? ';' : ':'; - paths = process.env['NODE_PATH'].split(splitter).concat(paths); + paths = process.env['NODE_PATH'].split(path.delimiter).concat(paths); } modulePaths = paths; diff --git a/test/simple/test-module-globalpaths-nodepath.js b/test/simple/test-module-globalpaths-nodepath.js new file mode 100644 index 0000000000..c99b6763b4 --- /dev/null +++ b/test/simple/test-module-globalpaths-nodepath.js @@ -0,0 +1,46 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var common = require('../common'); +var assert = require('assert'); + +var module = require('module'); + +var isWindows = process.platform === 'win32'; + +var partA, partB; + +if (isWindows) { + partA = 'C:\\Users\\Rocko Artischocko\\AppData\\Roaming\\npm'; + partB = 'C:\\Program Files (x86)\\nodejs\\'; + process.env['NODE_PATH'] = partA + ';' + partB; +} else { + partA = '/usr/test/lib/node_modules'; + partB = '/usr/test/lib/node'; + process.env['NODE_PATH'] = partA + ':' + partB; +} + +module._initPaths(); + +assert.ok(module.globalPaths.indexOf(partA) !== -1); +assert.ok(module.globalPaths.indexOf(partB) !== -1); + +assert.ok(Array.isArray(module.globalPaths));
\ No newline at end of file |