From 70d38dc0d4f2fbe8487f65596612a36c580ae9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jp@enix.org>
Date: Thu, 17 Oct 2013 20:33:14 -0700
Subject: [PATCH] Remove spurious messages, and use proper args expansion.

Also, display some (hopefully helpful) message when no command was given.
Upstream-commit: 8c38c309851c2a44b9c12bac8f29bc011ea4040f
Component: engine
---
 components/engine/hack/dind      | 7 ++++---
 components/engine/hack/make/test | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/engine/hack/dind b/components/engine/hack/dind
index e8b715cc9c..17e7dfa709 100755
--- a/components/engine/hack/dind
+++ b/components/engine/hack/dind
@@ -63,7 +63,7 @@ grep -qw devices /proc/1/cgroup ||
 	echo "WARNING: it looks like the 'devices' cgroup is not mounted."
 
 # Now, close extraneous file descriptors.
-pushd /proc/self/fd
+pushd /proc/self/fd >/dev/null
 for FD in *
 do
 	case "$FD" in
@@ -76,9 +76,10 @@ do
 		;;
 	esac
 done
-popd
+popd >/dev/null
 
 # Mount /tmp
 mount -t tmpfs none /tmp
 
-exec $*
+[ "$1" ] && exec "$@"
+echo "You probably want to run hack/make.sh, or maybe a shell?"
diff --git a/components/engine/hack/make/test b/components/engine/hack/make/test
index c09727702d..9554f2946b 100644
--- a/components/engine/hack/make/test
+++ b/components/engine/hack/make/test
@@ -14,6 +14,7 @@ bundle_test() {
 		for test_dir in $(find_test_dirs); do (
 			set -x
 			cd $test_dir
+			go test -i
 			go test -v -ldflags "$LDFLAGS" $TESTFLAGS
 		)  done
 	} 2>&1 | tee $DEST/test.log