From 5dfaaed8f7002ee1385c93fa14647ff128138f12 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 9 Jul 2017 18:17:29 -0400 Subject: testenv: make resilient to changes in config.mk --- test/testenv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/testenv b/test/testenv index 3bb827f..a744308 100755 --- a/test/testenv +++ b/test/testenv @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -e # Parse the arguments NETWORK=true @@ -31,7 +32,7 @@ old_pwd="$(pwd)" if [[ -f $0 ]]; then cd "${0%/*}" fi -if ! make -C .. install DESTDIR="$destdir" &>"$TMPDIR/make-output"; then +if ! make -C .. install prefix=/usr sysconfdir=/etc DESTDIR="$destdir" &>"$TMPDIR/make-output"; then echo 'error creating local install, cannot run tests' >&2 cat "$TMPDIR/make-output" exit 1 -- cgit v1.2.2