aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTad Fisher <tad@simple.com>2017-03-16 15:52:03 -0700
committerTad Fisher <tad@simple.com>2017-03-16 16:17:26 -0700
commitdaa004115c43890e5ff2b9f6a3c0f5672815125b (patch)
tree131852f412ed1722c0048f4c5502742b0738e3be /test
parent74d53f3d472452bbd25725b217e1b7a59759b8bc (diff)
downloadpass-otp-daa004115c43890e5ff2b9f6a3c0f5672815125b.tar.gz
pass-otp-daa004115c43890e5ff2b9f6a3c0f5672815125b.zip
Fix build
Diffstat (limited to 'test')
-rw-r--r--test/Makefile1
-rw-r--r--test/setup.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/test/Makefile b/test/Makefile
index 93f4d89..39f1df2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -17,6 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/ .
+SHELL := /bin/bash
SHELL_PATH ?= $(SHELL)
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
RM ?= rm -f
diff --git a/test/setup.sh b/test/setup.sh
index db8780d..f896382 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -25,11 +25,12 @@ unset EDITOR
# We must be called from test/
TEST_HOME="$(pwd)"
+EXT_HOME="$(dirname $TEST_HOME)"
. ./sharness.sh
export PASSWORD_STORE_ENABLE_EXTENSIONS=true
-export PASSWORD_STORE_EXTENSIONS_DIR="../"
+export PASSWORD_STORE_EXTENSIONS_DIR="$EXT_HOME"
export PASSWORD_STORE_DIR="$SHARNESS_TRASH_DIRECTORY/test-store"
rm -rf "$PASSWORD_STORE_DIR"