Remove generated file dependency to make fresh checkout tests work out of box

diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
index 7bd219cf7a9d708fbb15b86309f7f6efe9cf52ea..6e75b960cbaac8f981ad7e7cdc359fc517152035 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs
@@ -1460,14 +1460,23 @@ public class AssemblyBuilderTest
                        Assert.IsNotNull (refs [0].CultureInfo, "#D2:CultureInfo");
                        Assert.IsNull (refs [0].EscapedCodeBase, "#D2:EscapedCodeBase");
                        Assert.AreEqual (AssemblyNameFlags.None, refs [0].Flags, "#D2:Flags");
-                       Assert.AreEqual (Consts.AssemblyCorlib, refs [0].FullName, "#D2:FullName");
+                       Assert.AreEqual (typeof (object).FullName, refs [0].FullName, "#D2:FullName");
                        Assert.AreEqual (AssemblyHashAlgorithm.SHA1, refs [0].HashAlgorithm, "#D2:HashAlgorithm");
                        Assert.IsNull (refs [0].KeyPair, "#D2:KeyPair");
                        Assert.AreEqual ("mscorlib", refs [0].Name, "#D2:Name");
 #if NET_2_0
                        Assert.AreEqual (ProcessorArchitecture.None, refs [0].ProcessorArchitecture, "#D2:PA");
 #endif
-                       Assert.AreEqual (new Version (Consts.FxVersion), refs [0].Version, "#D2:Version");
+
+                       string FxVersion;
+#if MOBILE
+                       FxVersion = "2.0.5.0;";
+#elif NET_4_0
+                       FxVersion = "4.0.0.0;";
+#else
+                       FxVersion = "2.0.0.0;";
+#endif
+                       Assert.AreEqual (new Version (FxVersion), refs [0].Version, "#D2:Version");
                        Assert.AreEqual (AssemblyVersionCompatibility.SameMachine,
                                refs [0].VersionCompatibility, "#D2:VersionCompatibility");
                        Assert.IsNull (refs [0].GetPublicKey (), "#D2:GetPublicKey");

diff --git a/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs b/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
index e2d6392a8fa7bc508330958c4cc505515b296a5d..9880acdc61e9606bd28fa1ba5351de55c5c5b21a 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/AssemblyNameTest.cs
@@ -429,7 +429,16 @@ public class AssemblyNameTest {
        {
                an = typeof(int).Assembly.GetName ();
                Assert.IsNotNull (an.FullName, "#1");
-               Assert.AreEqual (Consts.AssemblyCorlib, an.FullName, "#2");
+
+               string AssemblyCorlib;
+#if MOBILE
+               AssemblyCorlib = "mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e";
+#elif NET_4_0
+               AssemblyCorlib = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
+#else
+               AssemblyCorlib = "mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
+#endif
+               Assert.AreEqual (AssemblyCorlib, an.FullName, "#2");
        }
 
        [Test]

diff --git a/mcs/class/corlib/Test/System/AppDomainTest.cs b/mcs/class/corlib/Test/System/AppDomainTest.cs
index f1be69587f4ded7f9e93c27849e7bc3e5c55d195..54ba7cef2a80f9ca3c9048507b379763915e68e6 100644 (file)
--- a/mcs/class/corlib/Test/System/AppDomainTest.cs
+++ b/mcs/class/corlib/Test/System/AppDomainTest.cs
@@ -1834,7 +1834,7 @@ namespace MonoTests.System
                                Assert.AreEqual (typeof (MissingMethodException), ex.GetType (), "#2");
                                Assert.IsNull (ex.InnerException, "#3");
                                Assert.IsNotNull (ex.Message, "#4");
-                               Assert.IsTrue (ex.Message.IndexOf (Consts.AssemblyCorlib) != -1, "#5");
+                               Assert.IsTrue (ex.Message.IndexOf (typeof (object).Assembly.FullName) != -1, "#5");
                        }
                }
 
@@ -1850,7 +1850,7 @@ namespace MonoTests.System
                                Assert.AreEqual (typeof (MissingMethodException), ex.GetType (), "#2");
                                Assert.IsNull (ex.InnerException, "#3");
                                Assert.IsNotNull (ex.Message, "#4");
-                               Assert.IsTrue (ex.Message.IndexOf (Consts.AssemblyCorlib) != -1, "#5");
+                               Assert.IsTrue (ex.Message.IndexOf (typeof (object).Assembly.FullName) != -1, "#5");
                        }
                }
 
@@ -1867,7 +1867,7 @@ namespace MonoTests.System
                                Assert.AreEqual (typeof (MissingMethodException), ex.GetType (), "#2");
                                Assert.IsNull (ex.InnerException, "#3");
                                Assert.IsNotNull (ex.Message, "#4");
-                               Assert.IsTrue (ex.Message.IndexOf (Consts.AssemblyCorlib) != -1, "#5");
+                               Assert.IsTrue (ex.Message.IndexOf (typeof (object).Assembly.FullName) != -1, "#5");
                        }
                }
 
@@ -1885,7 +1885,7 @@ namespace MonoTests.System
                                Assert.AreEqual (typeof (MissingMethodException), ex.GetType (), "#2");
                                Assert.IsNull (ex.InnerException, "#3");
                                Assert.IsNotNull (ex.Message, "#4");
-                               Assert.IsTrue (ex.Message.IndexOf (Consts.AssemblyCorlib) != -1, "#5");
+                               Assert.IsTrue (ex.Message.IndexOf (typeof (object).Assembly.FullName) != -1, "#5");
                        }
                }
 #endif

diff --git a/mcs/class/corlib/corlib_test.dll.sources b/mcs/class/corlib/corlib_test.dll.sources
index e99dc8577bf46f42acb72bd3f67b1e9c0a5c7298..97222a4d180eacb34a368dc51b9dae8d6c3980b3 100644 (file)
--- a/mcs/class/corlib/corlib_test.dll.sources
+++ b/mcs/class/corlib/corlib_test.dll.sources
@@ -1,4 +1,3 @@
-../../../build/common/Consts.cs
 Microsoft.Win32/RegistryKeyTest.cs
 Mono/DataConvertTest.cs
 ../Mono/DataConverter.cs