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

github.com/mono/linker.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2017-08-22 01:40:15 +0300
committerMarek Safar <marek.safar@gmail.com>2017-08-24 00:59:33 +0300
commit9fc2a24b5fc389a3bc3bde85efa1e39b43f1fce0 (patch)
tree52f2a9b19fa27b5b49158527ee9a9148946c172f /linker/Tests/TestCasesRunner/TestRunner.cs
parent07b07ef75fa1858253af45af6fe30812a5a1655c (diff)
Adds more type-forwarder tests
Diffstat (limited to 'linker/Tests/TestCasesRunner/TestRunner.cs')
-rw-r--r--linker/Tests/TestCasesRunner/TestRunner.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/linker/Tests/TestCasesRunner/TestRunner.cs b/linker/Tests/TestCasesRunner/TestRunner.cs
index 9693eeaf7..b9255435a 100644
--- a/linker/Tests/TestCasesRunner/TestRunner.cs
+++ b/linker/Tests/TestCasesRunner/TestRunner.cs
@@ -23,7 +23,7 @@ namespace Mono.Linker.Tests.TestCasesRunner {
var sandbox = Sandbox (testCase, metadataProvider);
var compilationResult = Compile (sandbox, metadataProvider);
- PrepForLink (sandbox, compilationResult);
+// PrepForLink (sandbox, compilationResult);
return Link (testCase, sandbox, compilationResult, metadataProvider);
}
}
@@ -47,13 +47,13 @@ namespace Mono.Linker.Tests.TestCasesRunner {
var expectationsAssemblyPath = compiler.CompileTestIn (sandbox.ExpectationsDirectory, "test.exe", sourceFiles, references, new [] { "INCLUDE_EXPECTATIONS" });
return new ManagedCompilationResult (inputAssemblyPath, expectationsAssemblyPath);
}
-
+/*
private void PrepForLink (TestCaseSandbox sandbox, ManagedCompilationResult compilationResult)
{
var entryPointLinkXml = sandbox.InputDirectory.Combine ("entrypoint.xml");
LinkXmlHelpers.WriteXmlFileToPreserveEntryPoint (compilationResult.InputAssemblyPath, entryPointLinkXml);
}
-
+*/
private LinkedTestCaseResult Link (TestCase testCase, TestCaseSandbox sandbox, ManagedCompilationResult compilationResult, TestCaseMetadaProvider metadataProvider)
{
var linker = _factory.CreateLinker ();
@@ -72,6 +72,9 @@ namespace Mono.Linker.Tests.TestCasesRunner {
AddAdditionalLinkOptions (builder, metadataProvider);
+ // TODO: Should be overridable
+ builder.LinkFromAssembly (compilationResult.InputAssemblyPath.ToString ());
+
linker.Link (builder.ToArgs ());
return new LinkedTestCaseResult (testCase, compilationResult.InputAssemblyPath, sandbox.OutputDirectory.Combine (compilationResult.InputAssemblyPath.FileName), compilationResult.ExpectationsAssemblyPath);