UnitTests now finds Plugins correctly

 * The x64 configurations of UnitTests were failing to load the
DisplayXMLFiles.dll library, because the test case was looking in the
old "c:/program files (x86)/winmerge" directory.  This directory only
has a 32-bit implementation of the dll file.

 * This patch allows the test case to now use the "c:/Program
Files/WinMerge" directory.

 * All four configurations x64/win32 and Release/Debug now run
correctly.

diff --git a/Testing/GoogleTest/Plugins/Plugins_test.cpp b/Testing/GoogleTest/Plugins/Plugins_test.cpp
index ff9e243..7c539cf 100644 (file)
--- a/Testing/GoogleTest/Plugins/Plugins_test.cpp
+++ b/Testing/GoogleTest/Plugins/Plugins_test.cpp
@@ -49,7 +49,7 @@ namespace
        TEST_F(PluginsTest, Unpack)
        {
                String oldModulePath = env::GetProgPath();
-               env::SetProgPath(_T("c:/program files (x86)/winmerge"));
+               env::SetProgPath(_T("c:/Program Files/WinMerge"));
                CAssureScriptsForThread asft;
                PackingInfo *iu = NULL;
                PrediffingInfo *ip = NULL;