Imported Upstream version 5.16.0.176

Former-commit-id: 2a68abbd7d315da91444d8e076512844099b08de
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-03 08:22:01 +00:00
parent 4d0627f707
commit c02e2f17d5
42 changed files with 45 additions and 34 deletions

View File

@@ -239,8 +239,8 @@ namespace System.SpanTests
[InlineData("aaaaaaaaaaaaaa", 1, "aaaxaaaaaaaaaa", 3, 100, StringComparison.Ordinal, -1)] // Different long alignment, abs of 4, one of them is 2, different at n=1
[InlineData("-aaaaaaaaaaaaa", 1, "++++aaaaaaaaaa", 4, 10, StringComparison.Ordinal, 0)] // Different long alignment, equal compare
[InlineData("aaaaaaaaaaaaaa", 1, "aaaaaaaaaaaaax", 4, 100, StringComparison.Ordinal, -1)] // Different long alignment
[InlineData("\0", 0, "", 0, 1, StringComparison.Ordinal, 1)] // Same memory layout, except for m_stringLength (m_firstChars are both 0)
[InlineData("\0\0", 0, "", 0, 2, StringComparison.Ordinal, 1)] // Same as above, except m_stringLength for one is 2
// [InlineData("\0", 0, "", 0, 1, StringComparison.Ordinal, 1)] // Same memory layout, except for m_stringLength (m_firstChars are both 0)
// [InlineData("\0\0", 0, "", 0, 2, StringComparison.Ordinal, 1)] // Same as above, except m_stringLength for one is 2
[InlineData("", 0, "\0b", 0, 2, StringComparison.Ordinal, -1)] // strA's second char != strB's second char codepath
[InlineData("", 0, "b", 0, 1, StringComparison.Ordinal, -1)] // Should hit strA.m_firstChar != strB.m_firstChar codepath
[InlineData("abcxxxxxxxxxxxxxxxxxxxxxx", 0, "abdxxxxxxxxxxxxxxx", 0, int.MaxValue, StringComparison.Ordinal, -1)] // 64-bit: first long compare is different

View File

@@ -522,7 +522,9 @@ namespace System.Text.Tests
}
[Theory]
#if !MOBILE
[InlineData("Hello", '\0', 1, "Hello\0")]
#endif
[InlineData("Hello", 'a', 1, "Helloa")]
[InlineData("", 'b', 1, "b")]
[InlineData("Hello", 'c', 2, "Hellocc")]
@@ -1298,7 +1300,9 @@ namespace System.Text.Tests
}
[Theory]
#if !MOBILE
[InlineData("Hello", 0, "\0", "\0Hello")]
#endif
[InlineData("Hello", 3, "abc", "Helabclo")]
[InlineData("Hello", 5, "def", "Hellodef")]
[InlineData("Hello", 0, "", "Hello")]
@@ -1488,8 +1492,10 @@ namespace System.Text.Tests
}
[Theory]
#if !MOBILE
[InlineData("Hello", 0, "\0", 0, "Hello")]
[InlineData("Hello", 0, "\0", 1, "\0Hello")]
#endif
[InlineData("Hello", 3, "abc", 1, "Helabclo")]
[InlineData("Hello", 5, "def", 1, "Hellodef")]
[InlineData("Hello", 0, "", 1, "Hello")]

View File

@@ -110,6 +110,7 @@ namespace System.Threading.Tests
}
[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "This test requires precise stack scanning")]
public static void RunThreadLocalTest5_Dispose()
{
// test recycling the combination index;