Merge branch 'master' into modules

SamWhited · web-flow · commit 91c91a736c4e · 2019-12-05T17:13:44.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,7 @@ script:
   - export GOOS=${TRAVIS_GOOS}
   - make build binaries
   - if [ "$GOOS" = "linux" ]; then make vet test; fi
+  - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make root-test; fi
   - if [ "$GOOS" != "linux" ]; then make test-compile; fi
 
 jobs:
diff --git a/Makefile b/Makefile
@@ -20,7 +20,18 @@ VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
 
 GO_LDFLAGS=-ldflags "-X `go list -mod=vendor ./version`.Version=$(VERSION)"
 
+PKG=github.com/containerd/continuity
+
 PACKAGES=$(shell go list -mod=vendor ./... | grep -v /vendor/)
+TEST_REQUIRES_ROOT_PACKAGES=$(filter \
+    ${PACKAGES}, \
+    $(shell \
+    for f in $$(git grep -l testutil.RequiresRoot | grep -v Makefile); do \
+        d="$$(dirname $$f)"; \
+        [ "$$d" = "." ] && echo "${PKG}" && continue; \
+        echo "${PKG}/$$d"; \
+    done | sort -u) \
+    )
 
 .PHONY: clean all fmt vet lint build test binaries
 .DEFAULT: default
@@ -64,6 +75,10 @@ test:
 	@echo "+ $@"
 	@go test -mod=vendor $(PACKAGES)
 
+root-test:
+	@echo "+ $@"
+	@go test ${TEST_REQUIRES_ROOT_PACKAGES} -test.root
+
 test-compile:
 	@echo "+ $@"
 	@for pkg in $(PACKAGES); do go test -mod=vendor -c $$pkg; done
