From 0da6604ccc8e3c6e946e0597ef716916801175a2 Mon Sep 17 00:00:00 2001 From: thefourtheye Date: Sun, 31 May 2015 22:48:18 +0530 Subject: [PATCH 1/2] tools: Copying contents of deps/npm to test-npm In Ubuntu, `cp -r deps/npm/ test-npm/` was copying `npm` directory under `test-npm` and the structure became `test-npm/npm`. But the test requires the contents of `deps/npm` to be under `test-npm`. Using `deps/npm/.` fixes it. --- tools/test-npm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-npm.sh b/tools/test-npm.sh index 9e7f161e7f5046..02cf20cd4368d5 100755 --- a/tools/test-npm.sh +++ b/tools/test-npm.sh @@ -16,7 +16,7 @@ rm -rf test-npm mkdir test-npm # make a copy of deps/npm to run the tests on -cp -r deps/npm/ test-npm/ +cp -r deps/npm/. test-npm/ cd test-npm From 11e3c1873acd68958a3e8fb5972f3e7cd918b437 Mon Sep 17 00:00:00 2001 From: thefourtheye Date: Mon, 1 Jun 2015 10:37:17 +0530 Subject: [PATCH 2/2] tools: removing mkdir as it is taken care by cp Instead of creating `test-npm` first and then copying the contents of `deps/npm`, we just create `test-npm` from `deps/npm` with the `cp -r` --- tools/test-npm.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/test-npm.sh b/tools/test-npm.sh index 02cf20cd4368d5..397df10c4cfe32 100755 --- a/tools/test-npm.sh +++ b/tools/test-npm.sh @@ -13,10 +13,9 @@ if [ -z $NODE_EXE ]; then fi rm -rf test-npm -mkdir test-npm # make a copy of deps/npm to run the tests on -cp -r deps/npm/. test-npm/ +cp -r deps/npm test-npm cd test-npm