[gjs] jsunit: prepend the srcdir when looking for uninstalled files
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] jsunit: prepend the srcdir when looking for uninstalled files
- Date: Tue, 4 Mar 2014 16:55:03 +0000 (UTC)
commit 66eada56e4f9273a1c474560693ff4f55765fc3d
Author: Giovanni Campagna <gcampagna gnome org>
Date: Tue Mar 4 17:35:40 2014 +0100
jsunit: prepend the srcdir when looking for uninstalled files
Fixes distcheck
Makefile-test.am | 2 +-
installed-tests/gjs-unit.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/Makefile-test.am b/Makefile-test.am
index 593ea04..1825bd5 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -42,7 +42,7 @@ check-local: gjs-tests
# GJS_PATH is empty here since we want to force the use of our own
# resources
TESTS_ENVIRONMENT = \
- TOP_SRCDIR=$(top_srcdir) \
+ TOP_SRCDIR=$(abs_top_srcdir) \
DBUS_SESSION_BUS_ADDRESS='' \
XDG_DATA_HOME=test_user_data \
GJS_DEBUG_OUTPUT=test_user_data/logs/gjs.log \
diff --git a/installed-tests/gjs-unit.cpp b/installed-tests/gjs-unit.cpp
index 9f58cee..5a33a42 100644
--- a/installed-tests/gjs-unit.cpp
+++ b/installed-tests/gjs-unit.cpp
@@ -185,7 +185,7 @@ main(int argc, char **argv)
if (g_getenv ("GJS_USE_UNINSTALLED_FILES") != NULL) {
/* typelib path is handled by the environment */
- js_test_dir = g_build_filename("installed-tests", "js", NULL);
+ js_test_dir = g_build_filename(g_getenv ("TOP_SRCDIR"), "installed-tests", "js", NULL);
} else {
g_irepository_prepend_search_path(INSTTESTDIR);
js_test_dir = g_build_filename(INSTTESTDIR, "js", NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]