summaryrefslogtreecommitdiff
path: root/Makefile.decl
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2013-05-29 21:35:53 -0400
committerMatthias Clasen <mclasen@redhat.com>2013-05-29 21:35:53 -0400
commit3d225fb059f6312a8c57896eebaaf9fa90d4bfc4 (patch)
treeddb8f18ed3b265e074a6faa7b5770144cded1506 /Makefile.decl
parentc9890d6cbb353e2df77f8a675d82e674a894ae06 (diff)
downloadgtk+-3d225fb059f6312a8c57896eebaaf9fa90d4bfc4.tar.gz
Makefile.decl: Set G_TEST_SRCDIR and G_TEST_BUILDDIR
These variables are needed to make file location functions work.
Diffstat (limited to 'Makefile.decl')
-rw-r--r--Makefile.decl6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.decl b/Makefile.decl
index 0f00030a6e..3fcd656530 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 ; \
}; \
}; \