summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <nicholson@endlessm.com>2014-04-23 16:49:35 -0700
committerDan Nicholson <nicholson@endlessm.com>2014-04-23 17:17:48 -0700
commit37d23240a1b049da56feb6d0659048d52016db7d (patch)
tree6df209e9f6573cd3632969da01cd3d1c28d99728
parentfcbd2267e33460ecc9b1c434c85e376642c5626c (diff)
Workaround gtk-doc tests interaction with parallel automake tests again
With the gtk-doc update, GTKDOC_CHECK was changed so that it becomes a wrapper script called gtkdoc-check.test to be compatible with parallel automake tests. That means it should just be run directly from TESTS and we no longer need the dummy wrapper file. [endlessm/eos-sdk#953]
-rw-r--r--docs/reference/endless/.gitignore3
-rw-r--r--docs/reference/endless/Makefile.am5
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/reference/endless/.gitignore b/docs/reference/endless/.gitignore
index 2df75cd..7c9e9bb 100644
--- a/docs/reference/endless/.gitignore
+++ b/docs/reference/endless/.gitignore
@@ -16,4 +16,5 @@
/tags
/version.xml
/xml
-/*.bak \ No newline at end of file
+/*.bak
+/gtkdoc-check.test
diff --git a/docs/reference/endless/Makefile.am b/docs/reference/endless/Makefile.am
index a344a9d..63219eb 100644
--- a/docs/reference/endless/Makefile.am
+++ b/docs/reference/endless/Makefile.am
@@ -93,8 +93,5 @@ TESTS_ENVIRONMENT = \
export DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE); \
export SRCDIR=$(abs_srcdir); \
export BUILDDIR=$(abs_builddir);
-# Need a dummy file to feed to GTKDOC_CHECK in the parallel test harness
-TESTS = gtkdoc-test-dummy-file
-LOG_COMPILER = $(GTKDOC_CHECK)
-EXTRA_DIST += gtkdoc-test-dummy-file
+TESTS = $(GTKDOC_CHECK)
endif