[Mono.Debugger.Soft] Move TypeLoadClass types to new file to improve testing

diff --git a/mcs/class/Mono.Debugger.Soft/Makefile b/mcs/class/Mono.Debugger.Soft/Makefile
index 1f20c1f89c63b6dceeb793a7241f8a2d4a6d34c2..e2fa98dcebe04e7629af935ed7847e9df90bfd16 100644 (file)
--- a/mcs/class/Mono.Debugger.Soft/Makefile
+++ b/mcs/class/Mono.Debugger.Soft/Makefile
@@ -16,7 +16,8 @@ VALID_TEST_PROFILE := $(filter net_4_x, $(PROFILE))
 ifdef VALID_TEST_PROFILE
 
 TEST_HELPERS_SOURCES = \
-       ../test-helpers/NetworkHelpers.cs
+       ../test-helpers/NetworkHelpers.cs \
+       Test/TypeLoadClass.cs
 
 test-local: dtest-app.exe dtest-excfilter.exe
 

diff --git a/mcs/class/Mono.Debugger.Soft/Test/TypeLoadClass.cs b/mcs/class/Mono.Debugger.Soft/Test/TypeLoadClass.cs
new file mode 100644 (file)
index 0000000..dfe4c3e
--- /dev/null
+++ b/mcs/class/Mono.Debugger.Soft/Test/TypeLoadClass.cs
@@ -0,0 +1,11 @@
+
+class TypeLoadClass
+{
+       static TypeLoadClass ()
+       {
+       }
+}
+
+class TypeLoadClass2
+{
+}
\ No newline at end of file

diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
index 42a02d6f16f174f5592217b664f188815908f2ae..532a6b207a1183216167b4439aed53d7db5e1465 100644 (file)
--- a/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
+++ b/mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
@@ -1589,12 +1589,6 @@ public class Tests : TestsBase, ITest2
        }
 }
 
-class TypeLoadClass {
-}
-
-class TypeLoadClass2 {
-}
-
 public class SentinelClass : MarshalByRefObject {
 }
 

diff --git a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
index 0eea592e2cf066dc59c4cf1978af748cb08bc09a..af994790ea00b44e9eedcf6e4d6af2467ee3e232 100644 (file)
--- a/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
+++ b/mcs/class/Mono.Debugger.Soft/Test/dtest.cs
@@ -3601,6 +3601,8 @@ public class DebuggerTests
                        return;
 
                string srcfile = (e as BreakpointEvent).Method.DeclaringType.GetSourceFiles (true)[0];
+               srcfile = srcfile.Replace ("dtest-app.cs", "TypeLoadClass.cs");
+               Assert.IsTrue (srcfile.Contains ("TypeLoadClass.cs"));
 
                var req = vm.CreateTypeLoadRequest ();
                req.SourceFileFilter = new string [] { srcfile.ToUpper () };