fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-22 11:20:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

name-test: run most C tests directly, not via run-test.sh

Browse source 
The exception is test-autolaunch, which is really not particularly
useful as a build-time test. The only way we can really test
autolaunch is as a whole-system integration test, and "make check"
is not that.

The two tests written in Python and one test based on dbus-send
are also not run directly yet; in particular, that includes both
the tests in run-test-systemserver.sh.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92899
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
Simon McVittie 2016-02-08 20:32:34 +00:00
parent c7e179f549
commit ec6b220e4d
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
test/name-test/Makefile.am
View file

@ -9,7 +9,15 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
TEST_EXTENSIONS = .sh
SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
SH_LOG_DRIVER = $(LOG_DRIVER)
LOG_COMPILER = \
@abs_top_builddir@/tools/dbus-run-session$(EXEEXT) \
--config-file=@abs_builddir@/uninstalled-session.conf \
--dbus-daemon=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
-- \
$(NULL)
SH_LOG_COMPILER = $(SHELL)
## note that TESTS has special meaning (stuff to use in make check)
@ -22,16 +30,34 @@ if DBUS_UNIX
AM_TESTS_ENVIRONMENT = \
export DBUS_TOP_BUILDDIR=@abs_top_builddir@; \
export DBUS_TOP_SRCDIR=@abs_top_srcdir@; \
export PATH="@abs_top_builddir@/bus:$$PATH"; \
export PYTHON=@PYTHON@; \
export DBUS_TEST_DATA=@abs_top_builddir@/test/data; \
export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \
export DBUS_TEST_DBUS_LAUNCH=@abs_top_builddir@/tools/dbus-launch$(EXEEXT); \
export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \
unset DBUS_SESSION_BUS_ADDRESS; \
unset DBUS_SESSION_BUS_PID; \
$(NULL)
uninstalled-session.conf: $(top_builddir)/bus/session.conf Makefile
$(SED) -e 's|<standard_session_servicedirs.*$$|<servicedir>@abs_top_builddir@/test/data/valid-service-files</servicedir>|g' \
-e 's|<include.*$$||g' \
< $< > $@
check_DATA = \
uninstalled-session.conf \
$(NULL)
TESTS += \
run-test.sh \
run-test-systemserver.sh \
test-ids \
test-pending-call-dispatch \
test-pending-call-timeout \
test-privserver-client \
test-shutdown \
test-threads-init \
$(NULL)
endif
endif

10
test/name-test/run-test.sh
View file

@ -67,14 +67,8 @@ py_test () {
}
test_num=1
# TAP test plan: we will run 8 tests
echo "1..8"
# TAP test plan: we will run 2 tests
echo "1..2"
c_test test-ids
c_test test-pending-call-dispatch
c_test test-pending-call-timeout
c_test test-threads-init
c_test test-privserver-client
c_test test-shutdown
py_test test-activation-forking.py
c_test test-autolaunch