From 034764d2e056c04dbd32ae543323d32e59b9a714 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 15 Jun 2011 12:43:15 +0100 Subject: [PATCH] Use EXEEXT when running tests from another directory, and skip bus-test-launch-helper on non-Unix This is necessary when cross-compiling from Linux to mingw32 and running the resulting tests under Wine. (This partially works! Some tests fail, though.) --- test/Makefile.am | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index d2a846d..c308c4b 100644 --- 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= -- 1.7.5.4