From 98d2739f45f9ed6f2d4a3f12d63ef0aee5e814ba Mon Sep 17 00:00:00 2001
From: Gus Eggert <gus.eggert@protocol.ai>
Date: Mon, 2 Aug 2021 14:29:21 -0400
Subject: [PATCH] Remove MAKE_SKIP_PATH test

---
 test/sharness/lib/test-lib.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/test/sharness/lib/test-lib.sh b/test/sharness/lib/test-lib.sh
index e67f56d4b..145420fa6 100644
--- a/test/sharness/lib/test-lib.sh
+++ b/test/sharness/lib/test-lib.sh
@@ -9,17 +9,15 @@
 # use the ipfs tool to test against
 
 # add current directory to path, for ipfs tool.
-if test "$MAKE_SKIP_PATH" != "1"; then
-  BIN=$(cd .. && echo `pwd`/bin)
-  BIN2=$(cd ../.. && echo `pwd`/cmd/ipfs)
-  PATH=${BIN2}:${BIN}:${PATH}
+BIN=$(cd .. && pwd)/bin
+BIN2=$(cd ../.. && pwd)/cmd/ipfs
+PATH=${BIN2}:${BIN}:${PATH}
 
-  # assert the `ipfs` we're using is the right one.
-  if test `which ipfs` != ${BIN2}/ipfs; then
-    echo >&2 "Cannot find the tests' local ipfs tool."
-    echo >&2 "Please check test and ipfs tool installation."
-    exit 1
-  fi
+# assert the `ipfs` we're using is the right one.
+if test "$(which ipfs)" != "${BIN2}/ipfs"; then
+  echo >&2 "Cannot find the tests' local ipfs tool."
+  echo >&2 "Please check test and ipfs tool installation."
+  exit 1
 fi
 
 # set sharness verbosity. we set the env var directly as