From 6c0c7ce255da60005b88135d7e41aff8be427593 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 17 Nov 2015 16:42:01 +0000 Subject: [PATCH] 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 Rewieved-by: Ralf Habacker --- test/name-test/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 0922558..3b7fcc6 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 -- 2.7.4