Merge pull request #3796 from ntherning/windows-backend-for-MemoryMappedFile

[mono.git] / mcs / class / System.Configuration / Test / Util / TestUtil.cs

diff --git a/mcs/class/System.Configuration/Test/Util/TestUtil.cs b/mcs/class/System.Configuration/Test/Util/TestUtil.cs
index 6faeba67a14b2212d74a2b3643828c129d7678ee..497a8a8081da1ee056ebed31b4bb34427ee2c5b3 100644 (file)
--- a/mcs/class/System.Configuration/Test/Util/TestUtil.cs
+++ b/mcs/class/System.Configuration/Test/Util/TestUtil.cs
@@ -64,17 +64,16 @@ namespace MonoTests.System.Configuration.Util {
                        }
                }
 
-               public static string ThisDllName {
+               public static string ThisApplicationPath {
                        get {
-                               var asm = Assembly.GetCallingAssembly ();
-                               return Path.GetFileName (asm.Location);
+                               var asm = Assembly.GetEntryAssembly ();
+                               return asm.Location;
                        }
                }
 
                public static string ThisConfigFileName {
                        get {
-                               var asm = Assembly.GetCallingAssembly ();
-                               var exe = Path.GetFileName (asm.Location);
+                               var exe = Path.GetFileName (ThisApplicationPath);
                                return exe + ".config";
                        }
                }