Use EXEEXT when running tests from another directory, and skip bus-test-launch-helper...

This is necessary when cross-compiling from Linux to mingw32 and running
the resulting tests under Wine. (This partially works! Some tests fail,
though.)

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>

diff --git a/test/Makefile.am b/test/Makefile.am
index d2a846d..c308c4b 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -34,12 +34,15 @@ TESTS = \
 ## order, but we don't want to run them til we arrive in this directory,
 ## since they depend on stuff from this directory
 TESTS += \
-       ../bus/bus-test \
-       ../bus/bus-test-system \
-       ../bus/bus-test-launch-helper \
-       ../dbus/dbus-test \
+       ../bus/bus-test$(EXEEXT) \
+       ../bus/bus-test-system$(EXEEXT) \
+       ../dbus/dbus-test$(EXEEXT) \
        $(NULL)
 
+if DBUS_UNIX
+TESTS += ../bus/bus-test-launch-helper$(EXEEXT)
+endif
+
 else !DBUS_BUILD_TESTS
 
 TEST_BINARIES=