diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-11-17 16:42:01 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-17 21:09:47 +0100 |
| commit | 6c0c7ce255da60005b88135d7e41aff8be427593 (patch) | |
| tree | 9386ba3d4162c9678273559c794c90e1a881e627 | |
| parent | 0bcc5d58daf7af67869610f02731715b362c0f85 (diff) | |
| download | dbus-6c0c7ce255da60005b88135d7e41aff8be427593.tar.gz | |
name-test: don't run these tests with autotools if targeting Windows.
The wrapper shell script that sets up their environment is nowhere
near being portable. In particular, it uses dbus-run-session,
which is Unix-specific.
[rh: Add autotools scope in commit title]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92899
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Rewieved-by: Ralf Habacker <ralf.habacker@freenet.de>
| -rw-r--r-- | test/name-test/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 0922558f..3b7fcc62 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -15,7 +15,10 @@ SH_LOG_COMPILER = $(SHELL) ## note that TESTS has special meaning (stuff to use in make check) ## so if adding tests not to be run in make check, don't add them to ## TESTS +TESTS = + if DBUS_ENABLE_EMBEDDED_TESTS +if DBUS_UNIX AM_TESTS_ENVIRONMENT = \ export DBUS_TOP_BUILDDIR=@abs_top_builddir@; \ export DBUS_TOP_SRCDIR=@abs_top_srcdir@; \ @@ -25,9 +28,11 @@ AM_TESTS_ENVIRONMENT = \ export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \ $(NULL) -TESTS=run-test.sh run-test-systemserver.sh -else -TESTS= +TESTS += \ + run-test.sh \ + run-test-systemserver.sh \ + $(NULL) +endif endif EXTRA_DIST=run-test.sh run-test-systemserver.sh test-wait-for-echo.py test-activation-forking.py |