brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Fix distcheck for conformance tests

Browse Source 
We need to export G_TEST_SRCDIR and G_TEST_BUILDDIR if we want to be
able to build the path to the tests data.
This commit is contained in:
Emmanuele Bassi 2013-07-10 12:31:32 +01:00
parent 7fe7d56ae9
commit edb6e66d90
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/conform/Makefile.am
View File

@ -153,11 +153,15 @@ test_conformance_LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION
test_conformance_LDFLAGS = -export-dynamic
test: wrappers
@$(top_srcdir)/tests/conform/run-tests.sh \
@export G_TEST_SRCDIR="$(abs_srcdir)" ; \
export G_TEST_BUILDDIR="$(abs_builddir)" ; \
$(top_srcdir)/tests/conform/run-tests.sh \
./test-conformance$(EXEEXT) -o test-report.xml
test-verbose: wrappers
@$(top_srcdir)/tests/conform/run-tests.sh \
@export G_TEST_SRCDIR="$(abs_srcdir)" ; \
export G_TEST_BUILDDIR="$(abs_builddir)" ; \
$(top_srcdir)/tests/conform/run-tests.sh \
./test-conformance$(EXEEXT) -o test-report.xml --verbose
GTESTER = gtester
@ -188,6 +192,8 @@ test-report perf-report full-report: ${TEST_PROGS}
perf-report) test_options="-k -m=perf";; \
full-report) test_options="-k -m=perf -m=slow";; \
esac ; \
export G_TEST_SRCDIR="$(abs_srcdir)" ; \
export G_TEST_BUILDDIR="$(abs_builddir)" ; \
$(top_srcdir)/tests/conform/run-tests.sh \
./test-conformance$(EXEEXT) \
--verbose \
@ -227,6 +233,8 @@ test-report-npot perf-report-npot full-report-npot: ${TEST_PROGS}
perf-report-npot) test_options="-k -m=perf";; \
full-report-npot) test_options="-k -m=perf -m=slow";; \
esac ; \
export G_TEST_SRCDIR="$(abs_srcdir)" ; \
export G_TEST_BUILDDIR="$(abs_builddir)" ; \
$(top_srcdir)/tests/conform/run-tests.sh \
./test-conformance$(EXEEXT) \
--verbose \

7
tests/data/Makefile.am
View File

@ -1,4 +1,5 @@
NULL =
EXTRA_DIST =
json_files = \
test-script-animation.json \
@ -19,15 +20,19 @@ json_files = \
test-script-margin.json \
$(NULL)
EXTRA_DIST += $(json_files)
png_files = \
redhand.png \
redhand_alpha.png \
light0.png \
$(NULL)
EXTRA_DIST = $(json_files) $(png_files) clutter-1.0.suppressions
EXTRA_DIST += $(png_files)
if ENABLE_INSTALLED_TESTS
insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)/data
insttest_DATA = $(json_files) $(png_files)
endif
EXTRA_DIST += clutter-1.0.suppressions