test: Make PATH CI portable

strongloop · Mar 28, 2014 · 18a089b · 18a089b
1 parent 46a204b
commit 18a089b
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 9 deletions.
diff --git a/test/export-systemd.test.sh b/test/export-systemd.test.sh
@@ -11,6 +11,7 @@ PATH=$(dirname $(which node)) $NF export \
   --out sandbox --type systemd \
   --env fixtures/env.env --procfile fixtures/Procfile
 
-$SED -i -e "s%$(pwd)%TEST_DIR%g" sandbox/*
+$SED -i -e "s%$(pwd)%TEST_DIR%g" \
+        -e "s%$(dirname $(which node))%TEST_PATH%g" sandbox/*
 
 diff -r -u fixtures/systemd sandbox 1>&2 || exit $?
diff --git a/test/export-upstart-single.test.sh b/test/export-upstart-single.test.sh
@@ -11,6 +11,7 @@ PATH=$(dirname $(which node)) $NF export \
   --out sandbox --type upstart-single \
   --env fixtures/env.env --procfile fixtures/Procfile
 
-$SED -i -e "s%$(pwd)%TEST_DIR%g" sandbox/*
+$SED -i -e "s%$(pwd)%TEST_DIR%g" \
+        -e "s%$(dirname $(which node))%TEST_PATH%g" sandbox/*
 
 diff -r -u fixtures/upstart-single sandbox 1>&2 || exit $?
diff --git a/test/export-upstart.test.sh b/test/export-upstart.test.sh
@@ -11,6 +11,7 @@ PATH=$(dirname $(which node)) $NF export \
   --out sandbox --type upstart \
   --env fixtures/env.env --procfile fixtures/Procfile
 
-$SED -i -e "s%$(pwd)%TEST_DIR%g" sandbox/*
+$SED -i -e "s%$(pwd)%TEST_DIR%g" \
+        -e "s%$(dirname $(which node))%TEST_PATH%g" sandbox/*
 
 diff -r -u fixtures/upstart sandbox 1>&2 || exit $?
diff --git a/test/fixtures/upstart-single/upstart-single-test-api.conf b/test/fixtures/upstart-single/upstart-single-test-api.conf
@@ -14,7 +14,7 @@ env bind=0.0.0.0
 env mysql_host=localhost
 env mysql_user=toast
 env mysql_pass=peanutbutter
-env PATH=/usr/local/bin
+env PATH=TEST_PATH
 
 export PATH
 

diff --git a/test/fixtures/upstart-single/upstart-single-test-log.conf b/test/fixtures/upstart-single/upstart-single-test-log.conf
@@ -14,7 +14,7 @@ env bind=0.0.0.0
 env mysql_host=localhost
 env mysql_user=toast
 env mysql_pass=peanutbutter
-env PATH=/usr/local/bin
+env PATH=TEST_PATH
 
 export PATH
 

diff --git a/test/fixtures/upstart-single/upstart-single-test-web.conf b/test/fixtures/upstart-single/upstart-single-test-web.conf
@@ -14,7 +14,7 @@ env bind=0.0.0.0
 env mysql_host=localhost
 env mysql_user=toast
 env mysql_pass=peanutbutter
-env PATH=/usr/local/bin
+env PATH=TEST_PATH
 
 export PATH
 

diff --git a/test/fixtures/upstart/upstart-test-api-1.conf b/test/fixtures/upstart/upstart-test-api-1.conf
@@ -8,7 +8,7 @@ env bind=0.0.0.0
 env mysql_host=localhost
 env mysql_user=toast
 env mysql_pass=peanutbutter
-env PATH=/usr/local/bin
+env PATH=TEST_PATH
 env PORT=5100
 
 export PATH

diff --git a/test/fixtures/upstart/upstart-test-log-1.conf b/test/fixtures/upstart/upstart-test-log-1.conf
@@ -8,7 +8,7 @@ env bind=0.0.0.0
 env mysql_host=localhost
 env mysql_user=toast
 env mysql_pass=peanutbutter
-env PATH=/usr/local/bin
+env PATH=TEST_PATH
 env PORT=5200
 
 export PATH

diff --git a/test/fixtures/upstart/upstart-test-web-1.conf b/test/fixtures/upstart/upstart-test-web-1.conf
@@ -8,7 +8,7 @@ env bind=0.0.0.0
 env mysql_host=localhost
 env mysql_user=toast
 env mysql_pass=peanutbutter
-env PATH=/usr/local/bin
+env PATH=TEST_PATH
 env PORT=5000
 
 export PATH