[gtk+] Makefile.decl: Set G_TEST_SRCDIR and G_TEST_BUILDDIR
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Makefile.decl: Set G_TEST_SRCDIR and G_TEST_BUILDDIR
- Date: Thu, 30 May 2013 01:37:45 +0000 (UTC)
commit 3d225fb059f6312a8c57896eebaaf9fa90d4bfc4
Author: Matthias Clasen <mclasen redhat com>
Date: Wed May 29 21:35:53 2013 -0400
Makefile.decl: Set G_TEST_SRCDIR and G_TEST_BUILDDIR
These variables are needed to make file location functions
work.
Makefile.decl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.decl b/Makefile.decl
index 0f00030..3fcd656 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -40,7 +40,7 @@ test: test-cwd test-recurse
# test-cwd: run tests in cwd
test-cwd: ${TEST_PROGS}
@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
- $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) ${GTESTER} --verbose ${TEST_PROGS}; }; \
+ $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) G_TEST_SRCDIR="${abs_strcdir}"
G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose ${TEST_PROGS}; }; \
}
# test-recurse: run tests in subdirs
test-recurse:
@@ -70,9 +70,9 @@ test-report perf-report full-report: ${TEST_PROGS}
$(XVFB_START) && { \
set -e; \
if test -z "$$GTESTER_LOGDIR" ; then \
- ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+ G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose
$$test_options -o test-report.xml ${TEST_PROGS} ; \
elif test -n "${TEST_PROGS}" ; then \
- ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ;
\
+ G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose
$$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
fi ; \
}; \
}; \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]