From f6831ab46b81d62cab7cd9e497b1d7656e373b9e Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Tue, 10 Nov 2015 23:30:08 +0000
Subject: [PATCH] Increase packaging test logging

---
 packaging/test.sh | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/packaging/test.sh b/packaging/test.sh
index 82f4a3b1..a9372a2a 100755
--- a/packaging/test.sh
+++ b/packaging/test.sh
@@ -6,11 +6,11 @@ if ! type docker >/dev/null; then
   exit 1
 fi
 
-test="npm run clean && NODE_ENV=development npm install --unsafe-perm && npm test && npm run clean"
+test="npm run clean; NODE_ENV=development npm install --unsafe-perm; npm test; npm run clean;"
 
 # Debian 7
 echo -n "Testing wheezy... "
-if docker run -i -t --rm -v $PWD:/v nodesource/wheezy:0.12 sh -c "cd /v && ./packaging/test/debian.sh && ./preinstall.sh && $test" >/dev/null;
+if docker run -i -t --rm -v $PWD:/v nodesource/wheezy:0.12 sh -c "cd /v; ./packaging/test/debian.sh; ./preinstall.sh; $test";
 then echo "OK"
 else echo "fail"
 fi
@@ -18,40 +18,40 @@ fi
 # Debian 8
 # Ubuntu 12.04, 14.04
 for dist in jessie precise trusty; do
-  echo -n "Testing $dist... "
-  if docker run -i -t --rm -v $PWD:/v nodesource/$dist:0.12 sh -c "cd /v && ./packaging/test/debian.sh && $test" >/dev/null;
-  then echo "OK"
-  else echo "fail"
+  echo "Testing $dist..."
+  if docker run -i -t --rm -v $PWD:/v nodesource/$dist:0.12 sh -c "cd /v; ./packaging/test/debian.sh; $test";
+  then echo "$dist OK"
+  else echo "$dist fail"
   fi
 done
 
 # Centos 6
-echo -n "Testing centos6... "
-if docker run -i -t --rm -v $PWD:/v nodesource/centos6:0.12 sh -c "cd /v && source ./packaging/test/centos6.sh && ./preinstall.sh && $test" >/dev/null;
-then echo "OK"
-else echo "fail"
+echo "Testing centos6..."
+if docker run -i -t --rm -v $PWD:/v nodesource/centos6:0.12 sh -c "cd /v; source ./packaging/test/centos6.sh; ./preinstall.sh; $test";
+then echo "centos6 OK"
+else echo "centos6 fail"
 fi
 
 # Centos 7
 # Fedora 20, 21
 for dist in centos7 fedora20 fedora21; do
-  echo -n "Testing $dist... "
-  if docker run -i -t --rm -v $PWD:/v nodesource/$dist:0.12 sh -c "cd /v && $test" >/dev/null;
-  then echo "OK"
-  else echo "fail"
+  echo "Testing $dist..."
+  if docker run -i -t --rm -v $PWD:/v nodesource/$dist:0.12 sh -c "cd /v; $test";
+  then echo "$dist OK"
+  else echo "$dist fail"
   fi
 done
 
 # openSUSE 13.2
-echo -n "Testing opensuse... "
-if docker run -i -t --rm -v $PWD:/v opensuse:13.2 sh -c "cd /v && ./packaging/test/opensuse.sh && $test" >/dev/null;
-then echo "OK"
-else echo "fail"
+echo "Testing opensuse..."
+if docker run -i -t --rm -v $PWD:/v opensuse:13.2 /bin/sh -c "cd /v; ./packaging/test/opensuse.sh; $test";
+then echo "opensuse OK"
+else echo "opensuse fail"
 fi
 
 # Archlinux 2015.06.01
-echo -n "Testing archlinux... "
-if docker run -i -t --rm -v $PWD:/v base/archlinux:2015.06.01 sh -c "cd /v && ./packaging/test/archlinux.sh && $test" >/dev/null;
-then echo "OK"
-else echo "fail"
+echo "Testing archlinux..."
+if docker run -i -t --rm -v $PWD:/v base/archlinux:2015.06.01 sh -c "cd /v; ./packaging/test/archlinux.sh; $test";
+then echo "archlinux OK"
+else echo "archlinux fail"
 fi