From 73cffb3c7f9a27e7e4af7befb415337ecfbcf077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 27 May 2017 05:03:11 +0200 Subject: [PATCH] tests: Adjust test runner The script currently assumes that srcdir is relative to builddir, which is not the case for build directories outside the source tree like the one used by jhbuild. While we could get fancy and prepend the builddir if srcdir is relative, there's nothing wrong with a relative path as we cd into the builddir before evaluating srcdir. https://bugzilla.gnome.org/show_bug.cgi?id=783206 --- tests/run-test.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run-test.sh.in b/tests/run-test.sh.in index d8f5a9bbe..f55d96656 100755 --- a/tests/run-test.sh.in +++ b/tests/run-test.sh.in @@ -27,11 +27,11 @@ done builddir=`dirname $0` builddir=`cd $builddir && pwd` -srcdir=$builddir/@srcdir@ +srcdir=@srcdir@ srcdir=`cd $srcdir && pwd` GI_TYPELIB_PATH="$GI_TYPELIB_PATH${GI_TYPELIB_PATH:+:}@MUTTER_TYPELIB_DIR@:$builddir/../src:$builddir/../src/gvc" -GJS_PATH="$srcdir:$srcdir/../js" +GJS_PATH="$srcdir:$srcdir/../js:$builddir/../js" GJS_DEBUG_OUTPUT=stderr $verbose || GJS_DEBUG_TOPICS="JS ERROR;JS LOG" GNOME_SHELL_TESTSDIR="$srcdir/"