From: thefourtheye <thechargingvolcano@gmail.com>
Date: Sun, 31 May 2015 17:18:18 +0000 (+0530)
Subject: tools: Fix copying contents of deps/npm
X-Git-Tag: v2.3.0~87
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1baba0580d932d7199b8144edc8951a459d569ec;p=platform%2Fupstream%2Fnodejs.git

tools: Fix copying contents of deps/npm

This fixes a platform inconsistency between BSD and GNU `cp` where
`deps/npm` would be copied into a subdirectory of `test-npm` on Linux,
but not on OS X.

PR-URL: https://github.com/nodejs/io.js/pull/1853
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
---

diff --git a/tools/test-npm.sh b/tools/test-npm.sh
index 9e7f161..397df10 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