[gjs/wip/ptomato/autotools: 3/7] build: Distribute test files unconditionally

[Philip Chimento <pchimento src gnome org>]

commit f85c9d7e3a66bb2206841c9ec7d1a3c751ac0726
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Sep 29 12:50:53 2016 -0700

    build: Distribute test files unconditionally
    
    Previously the installed test files would only make it into the
    distributed tarball if the package was configured with
    --enable-installed-tests. This is bad, since it means that the contents
    of the official release tarballs depend on the current configuration of
    whichever maintainer is making them.
    
    Instead, distribute the test files unconditionally, but only install them
    if configured with --enable-installed-tests.

 Makefile-insttest.am |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/Makefile-insttest.am b/Makefile-insttest.am
index 7913bce..5bd3035 100644
--- a/Makefile-insttest.am
+++ b/Makefile-insttest.am
@@ -126,10 +126,7 @@ noinst_DATA += $(TEST_INTROSPECTION_GIRS:.gir=.typelib)
 endif
 CLEANFILES += $(TEST_INTROSPECTION_GIRS) $(TEST_INTROSPECTION_GIRS:.gir=.typelib)
 
-jstestsdir = $(gjsinsttestdir)/js
-dist_jstests_DATA =
-if BUILDOPT_INSTALL_TESTS
-dist_jstests_DATA += \
+common_jstests_files =                                         \
        installed-tests/js/test0010basic.js             \
        installed-tests/js/test0020importer.js          \
        installed-tests/js/test0030basicBoxed.js                \
@@ -138,7 +135,6 @@ dist_jstests_DATA += \
        installed-tests/js/testByteArray.js             \
        installed-tests/js/testClass.js                 \
        installed-tests/js/testCoverage.js \
-       installed-tests/js/testGDBus.js                 \
        installed-tests/js/testExceptions.js            \
        installed-tests/js/testEverythingBasic.js               \
        installed-tests/js/testEverythingEncapsulated.js        \
@@ -148,7 +144,6 @@ dist_jstests_DATA += \
        installed-tests/js/testGIMarshalling.js         \
        installed-tests/js/testGObjectClass.js          \
        installed-tests/js/testGObjectInterface.js              \
-       installed-tests/js/testGtk.js                   \
        installed-tests/js/testGTypeClass.js            \
        installed-tests/js/testInterface.js                     \
        installed-tests/js/testJS1_8.js                 \
@@ -164,8 +159,29 @@ dist_jstests_DATA += \
        installed-tests/js/testTweener.js                       \
        installed-tests/js/testUnicode.js
 
+EXTRA_DIST +=                                          \
+       $(common_jstests_files)                         \
+       installed-tests/js/testCairo.js                 \
+       installed-tests/js/testGtk.js                   \
+       installed-tests/js/testGDBus.js                 \
+       installed-tests/scripts/testSystemExit.js       \
+       $(NULL)
+
+if BUILDOPT_INSTALL_TESTS
+
+jstestsdir = $(gjsinsttestdir)/js
+jstests_DATA = $(common_jstests_files)
+
 if ENABLE_CAIRO
-dist_jstests_DATA += installed-tests/js/testCairo.js
+jstests_DATA += installed-tests/js/testCairo.js
+endif
+
+if ENABLE_GTK
+jstests_DATA += installed-tests/js/testGtk.js
+endif
+
+if DBUS_TESTS
+jstests_DATA += installed-tests/js/testGDBus.js
 endif
 
 %.test: installed-tests/scripts/%.js installed-tests/script.test.in Makefile
@@ -176,6 +192,6 @@ endif
        mv $@.tmp $@
 
 jsscripttestsdir = $(gjsinsttestdir)/scripts
-dist_jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
+jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
 installedtestmeta_DATA += testSystemExit.test
 endif