[gnome-shell/wip/fmuellner/meson: 5/9] tests: Adjust test runner
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/fmuellner/meson: 5/9] tests: Adjust test runner
- Date: Tue, 30 May 2017 05:17:41 +0000 (UTC)
commit afd257a695f794e6fa52a6b7e0e27dacfe09e5e0
Author: Florian Müllner <fmuellner gnome org>
Date: Sat May 27 05:03:11 2017 +0200
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 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tests/run-test.sh.in b/tests/run-test.sh.in
index d8f5a9b..f55d966 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/"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]