]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
name-test: don't run these tests with autotools if targeting Windows.
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 17 Nov 2015 16:42:01 +0000 (16:42 +0000)
committerRalf Habacker <ralf.habacker@freenet.de>
Tue, 17 Nov 2015 20:09:47 +0000 (21:09 +0100)
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>
test/name-test/Makefile.am

index 0922558f06d6c5d754bd79acc8496db7177014a4..3b7fcc6282474a99a79c0ddd444c83afe6883451 100644 (file)
@@ -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