[clutter/clutter-1.16] build: Fix distcheck for conformance tests

[Emmanuele Bassi <ebassi src gnome org>]

commit edb6e66d90d2abae91b3cda25fb6029be24e1a14
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 10 12:31:32 2013 +0100

    build: Fix distcheck for conformance tests
    
    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.

 tests/conform/Makefile.am |   12 ++++++++++--
 tests/data/Makefile.am    |    7 ++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 1dc2194..10e359b 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -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 \
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 4444bd0..edbe23c 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -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