Skip to content

[runtime] Fix exception marshalling when the dynamic registrar is removed. (#3616) #3619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 1 commit into from
Mar 1, 2018
Merged

[runtime] Fix exception marshalling when the dynamic registrar is removed. (#3616) #3619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runtime/delegates.t4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"int", "int", "exc_handle"
) {
WrappedManagedFunction = "UnwrapNSException",
OnlyDynamicUsage = true,
OnlyDynamicUsage = false,
},

new XDelegate ("MonoObject *", "IntPtr", "xamarin_get_block_wrapper_creator",
Expand Down Expand Up @@ -232,7 +232,7 @@
"MonoReflectionType *", "IntPtr", "type"
) {
WrappedManagedFunction = "TypeGetFullName",
OnlyDynamicUsage = true,
OnlyDynamicUsage = false,
},

new XDelegate ("char *", "IntPtr", "xamarin_lookup_managed_type_name",
Expand Down
18 changes: 15 additions & 3 deletions tests/xharness/Jenkins.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class Jenkins
bool populating = true;

public Harness Harness;
public bool IncludeAll;
public bool IncludeClassicMac = true;
public bool IncludeBcl;
public bool IncludeMac = true;
Expand Down Expand Up @@ -156,6 +157,7 @@ class TestData
public bool Profiling;
public string LinkMode;
public string Defines;
public bool Ignored;
}

IEnumerable<TestData> GetTestData (RunTestTask test)
Expand All @@ -177,6 +179,7 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
switch (test.TestName) {
case "monotouch-test":
yield return new TestData { Variation = "Release (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = false, Profiling = false, Defines = "OPTIMIZEALL" };
yield return new TestData { Variation = "Debug (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = true, Profiling = false, Defines = "OPTIMIZEALL" };
break;
}
break;
Expand All @@ -186,15 +189,22 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
// The default is to run monotouch-test with the dynamic registrar (in the simulator), so that's already covered
yield return new TestData { Variation = "Debug (static registrar)", MTouchExtraArgs = "--registrar:static", Debug = true, Profiling = false };
yield return new TestData { Variation = "Release (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = false, Profiling = false, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL" };
yield return new TestData { Variation = "Debug (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all,-remove-uithread-checks", Debug = true, Profiling = false, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL", Ignored = !IncludeAll };
break;
}
break;
case "AnyCPU":
case "x86":
switch (test.TestName) {
case "xammac tests":
if (test.ProjectConfiguration == "Release")
yield return new TestData { Variation = "Release (all optimizations)", MonoBundlingExtraArgs = "--registrar:static --optimize:all", Debug = false, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL" };
switch (test.ProjectConfiguration) {
case "Release":
yield return new TestData { Variation = "Release (all optimizations)", MonoBundlingExtraArgs = "--registrar:static --optimize:all", Debug = false, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL"};
break;
case "Debug":
yield return new TestData { Variation = "Release (all optimizations)", MonoBundlingExtraArgs = "--registrar:static --optimize:all,-remove-uithread-checks", Debug = true, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL", Ignored = !IncludeAll };
break;
}
break;
}
break;
Expand All @@ -221,6 +231,7 @@ IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<XBuildTask, T
var profiling = test_data.Profiling;
var link_mode = test_data.LinkMode;
var defines = test_data.Defines;
var ignored = test_data.Ignored;

var clone = task.TestProject.Clone ();
var clone_task = Task.Run (async () => {
Expand Down Expand Up @@ -265,7 +276,7 @@ IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<XBuildTask, T
};
T newVariation = creator (build, task);
newVariation.Variation = variation;
newVariation.Ignored = task.Ignored;
newVariation.Ignored = task.Ignored || ignored;
rv.Add (newVariation);
}
}
Expand Down Expand Up @@ -538,6 +549,7 @@ void SelectTestsByLabel (int pull_request)
SetEnabled (labels, "ios-extensions", ref IncludeiOSExtensions);
SetEnabled (labels, "ios-device", ref IncludeDevice);
SetEnabled (labels, "xtro", ref IncludeXtro);
SetEnabled (labels, "all", ref IncludeAll);

// enabled by default
SetEnabled (labels, "ios", ref IncludeiOS);
Expand Down