Merge branch 'upstream'
Former-commit-id: d7360f4b544e7f4072482ce09aa1e54bd77f52c1
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
a0cf792d00
@ -1 +1 @@
|
||||
2c86edc3ba8bf7e9989f55c6f637d114fd0b28e1
|
||||
f0b6e21374ee9752e37831a38c20776e6960cbcd
|
||||
@ -1 +1 @@
|
||||
9aa1dfe93df405cbc803ec4dd5c3423e1e1d191f
|
||||
7d6429e36be0550c81f969db37a1ac1e621f4c30
|
||||
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.0.212";
|
||||
public const string MonoVersion = "5.20.0.216";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -405,15 +405,21 @@ namespace MonoTests.System
|
||||
}
|
||||
|
||||
#if !MOBILE
|
||||
// Ensure that we can convert a stacktrace to a
|
||||
// telemetry message
|
||||
//
|
||||
[Test]
|
||||
[Category("NotOnWindows")]
|
||||
public void StacktraceToState ()
|
||||
void NestedStackTraces (int depth)
|
||||
{
|
||||
if (depth == 0)
|
||||
throw new ArgumentException ("Depth 0 exception");
|
||||
|
||||
try {
|
||||
NestedStackTraces (depth - 1);
|
||||
} catch (Exception exc) {
|
||||
throw new Exception (String.Format ("Depth {0} exception, expect nested", depth), exc);
|
||||
}
|
||||
}
|
||||
void StacktraceToStateTest (int depth)
|
||||
{
|
||||
try {
|
||||
throw new Exception ("#0");
|
||||
NestedStackTraces (depth);
|
||||
} catch (Exception exc) {
|
||||
var monoType = Type.GetType ("Mono.Runtime", false);
|
||||
var convert = monoType.GetMethod("ExceptionToState", BindingFlags.NonPublic | BindingFlags.Static);
|
||||
@ -424,59 +430,41 @@ namespace MonoTests.System
|
||||
var portable_hash = output.Item2;
|
||||
var unportable_hash = output.Item3;
|
||||
|
||||
// To see what we're working with
|
||||
// Console.WriteLine (dump);
|
||||
|
||||
Assert.IsTrue (portable_hash != 0, "#1");
|
||||
Assert.IsTrue (unportable_hash != 0, "#2");
|
||||
Assert.IsTrue (dump.Length > 0, "#3");
|
||||
|
||||
// Console.WriteLine (dump);
|
||||
// dump should look something like:
|
||||
// {
|
||||
// "protocol_version" : "0.0.1",
|
||||
// "configuration" : {
|
||||
// "version" : "5.19.0 (managed_telemetry_pipeline/d342c73e320 Wed Aug 15 14:40:40 EDT 2018)",
|
||||
// "tlc" : "normal",
|
||||
// "sigsgev" : "altstack",
|
||||
// "notifications" : "kqueue",
|
||||
// "architecture" : "amd64",
|
||||
// "disabled_features" : "none",
|
||||
// "smallconfig" : "disabled",
|
||||
// "bigarrays" : "disabled",
|
||||
// "softdebug" : "enabled",
|
||||
// "interpreter" : "enabled",
|
||||
// "llvm_support" : "disabled",
|
||||
// "suspend" : "hybrid"
|
||||
// },
|
||||
// "memory" : {
|
||||
// "Resident Size" : "40693760",
|
||||
// "Virtual Size" : "4521312256",
|
||||
// "minor_gc_time" : "216992",
|
||||
// "major_gc_time" : "0",
|
||||
// "minor_gc_count" : "6",
|
||||
// "major_gc_count" : "0",
|
||||
// "major_gc_time_concurrent" : "0"
|
||||
// },
|
||||
// "threads" : [
|
||||
// {
|
||||
// "is_managed" : false,
|
||||
// "managed_thread_ptr" : "0x0",
|
||||
// "thread_info_addr" : "0x0",
|
||||
// "native_thread_id" : "0x0",
|
||||
// "managed_exception_type" : "System.Exception",
|
||||
// "managed_frames" : [
|
||||
// {
|
||||
// "is_managed" : "true",
|
||||
// "guid" : "43A03618-E657-44B0-B9FA-F63314A3C1B2",
|
||||
// "token" : "0x60008da",
|
||||
// "native_offset" : "0xb2",
|
||||
// "il_offset" : "0x00000"
|
||||
// }
|
||||
// ]
|
||||
// }
|
||||
// ]
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
// Ensure that we can convert a stacktrace to a
|
||||
// telemetry message
|
||||
//
|
||||
[Test]
|
||||
[Category("NotOnWindows")]
|
||||
public void StacktraceToStateBase ()
|
||||
{
|
||||
StacktraceToStateTest (0);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category("NotOnWindows")]
|
||||
public void StacktraceToStateDeeper ()
|
||||
{
|
||||
StacktraceToStateTest (2);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category("NotOnWindows")]
|
||||
public void StacktraceToStateOverflow ()
|
||||
{
|
||||
// We set a limit on 15 nested exceptions. Lets check that we're valid
|
||||
// when exceeding that limit.
|
||||
StacktraceToStateTest (20);
|
||||
}
|
||||
|
||||
void DumpSingle ()
|
||||
{
|
||||
var monoType = Type.GetType ("Mono.Runtime", false);
|
||||
|
||||
@ -1 +1 @@
|
||||
d03e66988382cc596efa6e6cd4e15b38dd662e2f
|
||||
bf5efc5447e6f4a911a6ec54f7cf8ad9235fe762
|
||||
@ -1 +1 @@
|
||||
1d23d17a634de9fdbb0dc9227c48f23b56a43fca
|
||||
bb36f1a11545bf4a03eb3573bdea38e58f46cccc
|
||||
@ -1 +1 @@
|
||||
f23f0206760d2a78d78ca1b09b56c8260a60e065
|
||||
71b08e4112901e636d98620ac91654b734f56293
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
4627cbb776b126cba78aac2713b8bb3839cb5404
|
||||
d37cf271f832133dd652fc851bd0f5d7b9169079
|
||||
@ -1 +1 @@
|
||||
740601bc775197bb507bcabb8c776613ac0864a8
|
||||
ed7cb36f1271f2b721d6d6a0d794b726adb4cd5b
|
||||
@ -1 +1 @@
|
||||
f86cd4ec65cf6fae7248f3f5e0bc9b4c6561dffc
|
||||
8000f304b65bd645bc78ec0627662a8cd92b8f36
|
||||
@ -1 +1 @@
|
||||
67f2dde2aeb02fb03415a58067ae5d11d45f74ec
|
||||
2eaa92b92d5c3487575d87df14a4ed6851924590
|
||||
@ -1 +1 @@
|
||||
d03e66988382cc596efa6e6cd4e15b38dd662e2f
|
||||
bf5efc5447e6f4a911a6ec54f7cf8ad9235fe762
|
||||
@ -1 +1 @@
|
||||
1d23d17a634de9fdbb0dc9227c48f23b56a43fca
|
||||
bb36f1a11545bf4a03eb3573bdea38e58f46cccc
|
||||
@ -1 +1 @@
|
||||
f23f0206760d2a78d78ca1b09b56c8260a60e065
|
||||
71b08e4112901e636d98620ac91654b734f56293
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
4627cbb776b126cba78aac2713b8bb3839cb5404
|
||||
d37cf271f832133dd652fc851bd0f5d7b9169079
|
||||
@ -1 +1 @@
|
||||
740601bc775197bb507bcabb8c776613ac0864a8
|
||||
ed7cb36f1271f2b721d6d6a0d794b726adb4cd5b
|
||||
@ -1 +1 @@
|
||||
f86cd4ec65cf6fae7248f3f5e0bc9b4c6561dffc
|
||||
8000f304b65bd645bc78ec0627662a8cd92b8f36
|
||||
@ -1 +1 @@
|
||||
67f2dde2aeb02fb03415a58067ae5d11d45f74ec
|
||||
2eaa92b92d5c3487575d87df14a4ed6851924590
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user