diff options
| author | Tad Fisher <tad@simple.com> | 2017-03-16 15:52:03 -0700 |
|---|---|---|
| committer | Tad Fisher <tad@simple.com> | 2017-03-16 16:17:26 -0700 |
| commit | daa004115c43890e5ff2b9f6a3c0f5672815125b (patch) | |
| tree | 131852f412ed1722c0048f4c5502742b0738e3be | |
| parent | 74d53f3d472452bbd25725b217e1b7a59759b8bc (diff) | |
Fix build
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | test/Makefile | 1 | ||||
| -rw-r--r-- | test/setup.sh | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index bb3623e..ed6b706 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,9 @@ addons: before_script: - wget https://git.zx2c4.com/password-store/snapshot/password-store-1.7.tar.xz - tar -xvf password-store-1.7.tar.xz - - export PATH=$PATH:$PWD/password-store-1.7/src + - ln -s password-store-1.7/src/password-store.sh pass + - export PATH=$PATH:. + - export TEST_OPTS="-v" install: true 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" |