فهرست منبع

Remove spurious messages, and use proper args expansion.

Also, display some (hopefully helpful) message when no command was given.
Jérôme Petazzoni 11 سال پیش
والد
کامیت
8c38c30985
2فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 4 3
      hack/dind
  2. 1 0
      hack/make/test

+ 4 - 3
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?"

+ 1 - 0
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