Revert "Remove MAKE_SKIP_PATH test"
This reverts commit 98d2739f45f9ed6f2d4a3f12d63ef0aee5e814ba.
Gus Eggert committed
Aug 13, 2021 at 16:37 UTC
e162f1afb35ab50f24bf3a312e7f025c92454e7c
1 file changed
+11
-9
test/sharness/lib/test-lib.sh
+11
-9
@@ -9,15 +9,17 @@
9
# use the ipfs tool to test against
10
11
# add current directory to path, for ipfs tool.
12
-BIN=$(cd .. && pwd)/bin
13
-BIN2=$(cd ../.. && pwd)/cmd/ipfs
14
-PATH=${BIN2}:${BIN}:${PATH}
15
-
16
-# assert the `ipfs` we're using is the right one.
17
-if test "$(which ipfs)" != "${BIN2}/ipfs"; then
18
- echo >&2 "Cannot find the tests' local ipfs tool."
19
- echo >&2 "Please check test and ipfs tool installation."
20
- exit 1
12
+if test "$MAKE_SKIP_PATH" != "1"; then
13
+ BIN=$(cd .. && echo `pwd`/bin)
14
+ BIN2=$(cd ../.. && echo `pwd`/cmd/ipfs)
15
+ PATH=${BIN2}:${BIN}:${PATH}
16
+
17
+ # assert the `ipfs` we're using is the right one.
18
+ if test `which ipfs` != ${BIN2}/ipfs; then
19
+ echo >&2 "Cannot find the tests' local ipfs tool."
20
+ echo >&2 "Please check test and ipfs tool installation."
21
+ exit 1
22
+ fi
23
fi
24
25
# set sharness verbosity. we set the env var directly as