diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-12 15:25:12 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-12 15:25:12 +0000 |
| commit | c285a053d6ab72b0eb61fbb432511c544ca15c65 (patch) | |
| tree | 1c2b5f8ac1525653ce8e7d72d13e0bf9190aca42 | |
| parent | 1aa36b48cc112b2005db62607bb0845c7e444647 (diff) | |
| download | dbus-c285a053d6ab72b0eb61fbb432511c544ca15c65.tar.gz | |
Revert "name-test: run most C tests directly, not via run-test.sh"
This reverts commit d893121efdea39d2b32037b32e336ea483829b2e.
This change was intended for 1.11.
| -rw-r--r-- | test/name-test/Makefile.am | 28 | ||||
| -rwxr-xr-x | test/name-test/run-test.sh | 10 |
2 files changed, 9 insertions, 29 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 877d4234..fae28920 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -9,15 +9,7 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ TEST_EXTENSIONS = .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_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh SH_LOG_COMPILER = $(SHELL) ## note that TESTS has special meaning (stuff to use in make check) @@ -30,34 +22,16 @@ 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 diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh index 092ec69f..8b9e7ad1 100755 --- a/test/name-test/run-test.sh +++ b/test/name-test/run-test.sh @@ -67,8 +67,14 @@ py_test () { } test_num=1 -# TAP test plan: we will run 2 tests -echo "1..2" +# TAP test plan: we will run 8 tests +echo "1..8" +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 |