From 5c7b1e03c1a9a3405608a78c11823048a3f3ea2f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 20 Jun 2014 23:13:30 -0400 Subject: fiddle with file locations I remember now that config.mk's change to ?= was so that xbs Makefiles could override $(binder). That was stupid. --- test/testenv | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/testenv b/test/testenv index 847a948..dcc54fa 100755 --- a/test/testenv +++ b/test/testenv @@ -31,15 +31,17 @@ old_pwd="$(pwd)" if [[ -f $0 ]]; then cd "${0%/*}" fi -make -C .. install DESTDIR=$destdir &>/dev/null || { - echo 'error creating local install, cannot run tests' +if ! make -C .. install DESTDIR="$destdir" &>"$TMPDIR/make-output"; then + echo 'error creating local install, cannot run tests' >&2 + cat "$TMPDIR/make-output" exit 1 -} +fi cd "$old_pwd" # Set up the environment export PATH="$destdir/usr/bin:$PATH" export LIBRETOOLS_LIBDIR="$destdir/usr/lib/libretools" +export XBS_LIBDIR="$destdir/usr/lib/xbs" export HOME=$TMPDIR/home export XDG_CACHE_HOME="$HOME/.cache" export XDG_CONFIG_HOME="$HOME/.config" -- cgit v1.2.3