From 3a7eaaf7eb2d0610711ccb3f6825272f7b706d66 Mon Sep 17 00:00:00 2001
From: Gus Eggert <gus.eggert@protocol.ai>
Date: Fri, 13 Aug 2021 16:33:31 -0400
Subject: [PATCH] Revert "Remove MAKE_SKIP_PATH, update Dockerfile base image"

This reverts commit d3468407aaddbed885abe878f80072186c33a449.
---
 Dockerfile             | 2 +-
 test/sharness/Rules.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6d3ef4d5a..9d70b0f63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Note: when updating the go minor version here, also update the go-channel in snap/snapcraft.yml
-FROM golang:1.16.6-buster
+FROM golang:1.16.3-buster
 LABEL maintainer="Steven Allen <steven@stebalien.com>"
 
 # Install deps
diff --git a/test/sharness/Rules.mk b/test/sharness/Rules.mk
index 6c9e6e633..dd59f8f6a 100644
--- a/test/sharness/Rules.mk
+++ b/test/sharness/Rules.mk
@@ -26,6 +26,8 @@ DEPS_$(d) += $(PLUGINS_$(d))
 endif
 endif
 
+#export MAKE_SKIP_PATH=1
+
 $(T_$(d)): $$(DEPS_$(d)) # use second expansion so coverage can inject dependency
 	@echo "*** $@ ***"
 ifeq ($(CONTINUE_ON_S_FAILURE),1)