Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kyte <alexmkyte@gmail.com>2017-11-15 17:56:26 +0300
committerLudovic Henry <luhenry@microsoft.com>2017-11-15 17:56:26 +0300
commitca8b8bd346a66b5a5a7bd1b5410421588f5af599 (patch)
tree6ae5847766371fae146b1784d4dfda3fa26d43b7 /mcs/class/Microsoft.Build
parent50fa04c1365f68f309c6d0613c96672deb0d07fc (diff)
[runtime] Add Dedup Support to MkBundle (#5484)
* [runtime] Fix mkbundle compilation on OSX * [runtime] Add aot arguments to mkbundle * [runtime] Enable compiling aot with mkbundle * [runtime] Add new dedup interface to mkbundle * [runtime] Fix path resolving for mkbundle * [runtime] Use mkbundle in BCL tests * [runtime] Skip building System.Security, System.IdentityModel tests on testing_aot_full * [runtime] Fix in-tree building for mkbundle * [runtime] Move testing dll into profile * [runtime] Add target to mkbundle all tests before CI * [runtime] Build stripper and use with mkbundle Preliminary linker support ran into dependency-finding bug with the monolinker.exe binary. Fix postponed until later. * [runtime] Skip not supported tests with mkbundle * [runtime] Don't re-aot when running BCL tests * [runtime] Provide config to mkbundle * [runtime] Fix mkbundle internationalization test results, build all * [runtime] Clean up temp mkbundle aot directory * [runtime] Add mkbundle support for dedup * [runtime] Fix tracking of dedup module in mkbundle * [runtime] Document mkbundle AOT options in man pages * [runtime] Fix CADMessage generic method argument marshalling
Diffstat (limited to 'mcs/class/Microsoft.Build')
-rw-r--r--mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs
index 2fbb9f18587..7d107c20a9b 100644
--- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs
+++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Construction/ProjectRootElementTest.cs
@@ -30,8 +30,13 @@ namespace MonoTests.Microsoft.Build.Construction
var xml = XmlReader.Create (new StringReader (empty_project_xml), null, "file:///foo.xml");
// This creator does not fill FullPath...
var root = ProjectRootElement.Create (xml);
+
+ // Expected to run from mcs/class/lib/profile/tests
+ var dir_name = Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath);
+ var namespace_path = Path.Combine (Directory.GetParent (dir_name).Parent.Parent.FullName, "Microsoft.Build");
+
Assert.IsNull (root.FullPath, "#2");
- Assert.AreEqual (Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath), root.DirectoryPath, "#3");
+ Assert.AreEqual (namespace_path, root.DirectoryPath, "#3");
}
[Test]
@@ -39,7 +44,11 @@ namespace MonoTests.Microsoft.Build.Construction
{
var root = ProjectRootElement.Create ();
root.FullPath = "test" + Path.DirectorySeparatorChar + "foo.xml";
- var full = Path.Combine (Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath), "test", "foo.xml");
+
+ // Expected to run from mcs/class/lib/profile/tests
+ var dir_name = Path.GetDirectoryName (new Uri (GetType ().Assembly.CodeBase).LocalPath);
+ var namespace_path = Path.Combine (Directory.GetParent (dir_name).Parent.Parent.FullName, "Microsoft.Build");
+ var full = Path.Combine (namespace_path, "test", "foo.xml");
Assert.AreEqual (full, root.FullPath, "#1");
Assert.AreEqual (Path.GetDirectoryName (full), root.DirectoryPath, "#1");
}