[longomatch] Force using our NUnit framework version

[Andoni Morales Alastruey <amorales src gnome org>]

commit 9d7a9c5865c95ddf76dffd6d28ad612a6de5d2f8
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Fri Mar 6 16:38:13 2015 +0100

    Force using our NUnit framework version

 Tests/Makefile.am          |    2 ++
 build/m4/shamrock/nunit.m4 |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/Tests/Makefile.am b/Tests/Makefile.am
index 7caf784..0469367 100644
--- a/Tests/Makefile.am
+++ b/Tests/Makefile.am
@@ -44,10 +44,12 @@ include $(top_srcdir)/build/build.mk
 
 if ENABLE_TESTS
 check:
+       cp $(NUNIT_FRAMEWORK_DLL) `dirname $(ASSEMBLY_FILE)`
        $(MONO) $(NUNIT_CONSOLE_EXE) $(ASSEMBLY_FILE)
 if HAVE_COVEM
 coverage:
        @rm -rf Tests.dll.covcfg.*
+       cp $(NUNIT_FRAMEWORK_DLL) `dirname $(ASSEMBLY_FILE)`
        @BABOON_CFG=Tests.dll.covcfg $(COVEM) $(NUNIT_CONSOLE_EXE) $(ASSEMBLY_FILE) || true
        @python print_coverage.py Tests.dll.covcfg.covreport
 show-coverage:
diff --git a/build/m4/shamrock/nunit.m4 b/build/m4/shamrock/nunit.m4
index e8931fa..42fbda5 100644
--- a/build/m4/shamrock/nunit.m4
+++ b/build/m4/shamrock/nunit.m4
@@ -15,10 +15,6 @@ AC_DEFUN([SHAMROCK_CHECK_NUNIT],
                AC_SUBST(NUNIT_LIBS)
                AM_CONDITIONAL(ENABLE_TESTS, test "x$do_tests" = "xyes")
 
-               AC_PATH_PROG(NUNIT_CONSOLE, nunit-console, no)
-               NUNIT_CONSOLE_EXE=`cat $NUNIT_CONSOLE | tr ' ' '\n' | grep nunit-console.exe`
-               AC_SUBST(NUNIT_CONSOLE_EXE)
-
                if test "x$do_tests" = "xno"; then
                        PKG_CHECK_MODULES(NUNIT, mono-nunit >= 2.4,
                                do_tests="yes", do_tests="no")
@@ -29,5 +25,11 @@ AC_DEFUN([SHAMROCK_CHECK_NUNIT],
                        if test "x$do_tests" = "xno"; then
                                AC_MSG_WARN([Could not find nunit: tests will not be available])              
          fi
                fi
+
+               NUNIT_CONSOLE_EXE=`echo $NUNIT_LIBS | tr ' ' '\n' | grep nunit-console.exe | cut -c4-`
+               AC_SUBST(NUNIT_CONSOLE_EXE)
+
+               NUNIT_FRAMEWORK_DLL=`echo $NUNIT_LIBS | tr ' ' '\n' | grep nunit.framework.dll | cut -c4-`
+               AC_SUBST(NUNIT_FRAMEWORK_DLL)
        fi
 ])