diff options
| author | isaacs <i@izs.me> | 2012-12-13 23:56:51 +0400 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-12-13 23:56:51 +0400 |
| commit | 6cb18d76205f4bd714596842b4c37ccdecfec956 (patch) | |
| tree | 6bc7f213b7f5f5e38997164e6f472cb4e4e32ff4 | |
| parent | 2915f61cdedba718a06191d33a8c6598be59741c (diff) | |
| parent | b1196d87e18c9bce0e40805a65cd0a9b766f3ca6 (diff) | |
Merge commit 'v1.1.69'
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test/packages/npm-test-shrinkwrap/test.js | 4 | ||||
| -rw-r--r-- | test/run.js | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/package.json b/package.json index 3c69e95da..660a276df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "1.1.68", + "version": "1.1.69", "name": "npm", "publishConfig": { "proprietary-attribs": false diff --git a/test/packages/npm-test-shrinkwrap/test.js b/test/packages/npm-test-shrinkwrap/test.js index afc8b33da..4dc4b2b15 100644 --- a/test/packages/npm-test-shrinkwrap/test.js +++ b/test/packages/npm-test-shrinkwrap/test.js @@ -5,7 +5,9 @@ process.env.npm_config_prefix = process.cwd() delete process.env.npm_config_global delete process.env.npm_config_depth -var npm = path.resolve(process.env.npm_config_prefix, "../../npm") +var npm = process.platform === "win32" + ? path.resolve(process.env.npm_config_prefix, "../../npm") + : path.resolve(process.env.npm_config_prefix, "../../../bin/npm") require("child_process").exec(npm + " ls --json", { stdio: "pipe", env: process.env, cwd: process.cwd() }, diff --git a/test/run.js b/test/run.js index 51ada04ce..697d33980 100644 --- a/test/run.js +++ b/test/run.js @@ -144,7 +144,7 @@ function main (cb) { installAllThenTestAll() function installAllThenTestAll () { - var packagesToRm = packages + var packagesToRm = packages.slice(0) if (process.platform !== "win32") { // Windows can't handle npm rm npm due to file-in-use issues. packagesToRm.push("npm") |