diff options
| author | C. Scott Ananian <cscott@litl.com> | 2009-06-05 13:53:38 -0400 |
|---|---|---|
| committer | C. Scott Ananian <cscott@litl.com> | 2009-06-05 15:07:25 -0400 |
| commit | 5374f31b37b0a146d1d0fac8a5bd4bc1200c90f6 (patch) | |
| tree | e459ffdb02f3692785016a2e6732f0c2c48731d6 /Makefile-test.am | |
| parent | eedf35c32c4bb8403e94644a7b6d5139503a079f (diff) | |
| download | gjs-5374f31b37b0a146d1d0fac8a5bd4bc1200c90f6.tar.gz | |
Add run-with-dbus to gtester invocation.
This allows 'make check' to use an independent dbus instance, so that
(a) headless buildbots can successfully make check, and (b) this test
is decoupled from details of the user's desktop environment.
The run-with-dbus code originally written by Havoc Pennington <hp@pobox.com>,
Tommi Komulainen <tko@litl.com>, Xan López <xan@litl.com>,
Johan Bilien <jobi@litl.com>, and Marco Pesenti Gritti <marcopg@litl.com>
for Litl, LLC.
Diffstat (limited to 'Makefile-test.am')
| -rw-r--r-- | Makefile-test.am | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/Makefile-test.am b/Makefile-test.am index 42d0073f..61439258 100644 --- a/Makefile-test.am +++ b/Makefile-test.am @@ -1,4 +1,5 @@ -GTESTER = ${TESTS_ENVIRONMENT} gtester +RUN_WITH_DBUS = ${top_srcdir}/test/run-with-dbus --session --system +GTESTER = ${TESTS_ENVIRONMENT} ${RUN_WITH_DBUS} gtester ######################################################################## TEST_PROGS += gjs-tests @@ -64,6 +65,11 @@ EXTRA_DIST += \ ######################################################################## TESTS_ENVIRONMENT = \ abs_top_srcdir="$(abs_top_srcdir)" \ + DBUS_SESSION_BUS_ADDRESS='' \ + XDG_DATA_HOME=$(abs_top_builddir)/test_user_data \ + GJS_DEBUG_OUTPUT=$(builddir)/test_user_data/logs/gjs.log \ + BUILDDIR=$(abs_top_builddir) \ + GJS_USE_UNINSTALLED_FILES=1 \ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(FIREFOX_JS_LIBDIR)" \ G_FILENAME_ENCODING=latin1 # ensure filenames are not utf8 @@ -96,14 +102,20 @@ valgrind-check valgrind-test: $(gjsnative_LTLIBRARIES) ${TEST_PROGS} echo "valgrind failed for:$$failed"; exit 1; \ }; \ } -CLEANFILES += $(TEST_PROGS:%=valgrind.%.log) +CLEANFILES += \ + $(TEST_PROGS:%=valgrind.%.log) \ + uninstalled-test-bus.conf \ + uninstalled-system-test-bus.conf + +clean-local: + -rm -rf test_user_data EXTRA_DIST += \ test/js/modules/jsUnit.js \ test/js/modules/alwaysThrows.js \ test/js/modules/foobar.js \ - test/js/modules/mutualImport/a.js \ - test/js/modules/mutualImport/b.js \ + test/js/modules/mutualImport/a.js \ + test/js/modules/mutualImport/b.js \ test/js/modules/subA/.secret.js \ test/js/modules/subA/.hidden/hidden.js \ test/js/modules/subA/foo \ @@ -120,7 +132,9 @@ EXTRA_DIST += \ test/js/testLocale.js \ test/js/testMainloop.js \ test/js/testSignals.js \ - test/js/testTweener.js + test/js/testTweener.js \ + test/run-with-dbus \ + test/test-bus.conf ######################################################################## if ENABLE_COVERAGE |