diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2016-06-01 19:54:19 +0300 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2016-06-01 21:35:51 +0300 |
| commit | 9d18dc706cff5a61a54b2143bb9dfb922b0624d1 (patch) | |
| tree | 8185fd25cd28b1fc4640ee72ca50a5d8d8b9bdac /mcs/class/Mono.Posix | |
| parent | 29556e2cd8ca7bbf45a5e8e642dd1ba0c1836bb4 (diff) | |
Xamarin.Android test suite updates
Xamarin.Android internal test suite takes advantage of the BCL tests
in Mono, so far their inclusion was a manual process and this commit
fixes it. A set of source inclusion and exclusion lists is added
and a handful of code fixes to make them compile on Xamarin.Android
Diffstat (limited to 'mcs/class/Mono.Posix')
4 files changed, 8 insertions, 2 deletions
diff --git a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixEncodingTest.cs b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixEncodingTest.cs index 1edf3f08289..2f0747294d3 100644 --- a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixEncodingTest.cs +++ b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixEncodingTest.cs @@ -1001,7 +1001,7 @@ namespace MonoTests.Mono.Unix { Assert.AreEqual (end.Length, bytes.Length, prefix + ": byte length"); - for (int i = 0; i < Math.Min (bytes.Length, end.Length); ++i) + for (int i = 0; i < global::System.Math.Min (bytes.Length, end.Length); ++i) Assert.AreEqual (end [i], bytes [i], prefix + ": byte " + i); int cc = unix.GetCharCount (end, 0, end.Length); @@ -1012,7 +1012,7 @@ namespace MonoTests.Mono.Unix { Assert.AreEqual (start.Length, r, prefix + ": chars length"); - for (int i = 0; i < Math.Min (r, start.Length); ++i) { + for (int i = 0; i < global::System.Math.Min (r, start.Length); ++i) { Assert.AreEqual (start [i], chars [i], prefix + ": char " + i); } } diff --git a/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.exclude.sources b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.exclude.sources new file mode 100644 index 00000000000..0facffb101d --- /dev/null +++ b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.exclude.sources @@ -0,0 +1,2 @@ +#include monodroid_Mono.Posix_test.dll.new-exclude.sources +Mono.Unix.Android/TestHelper.cs diff --git a/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.new-exclude.sources b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.new-exclude.sources new file mode 100644 index 00000000000..ed7337437ac --- /dev/null +++ b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.new-exclude.sources @@ -0,0 +1,3 @@ +Mono.Unix.Native/SocketTest.cs +Mono.Unix/UnixEndPointTest.cs +Mono.Unix/UnixListenerTest.cs diff --git a/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.sources b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.sources new file mode 100644 index 00000000000..3af39dbfb09 --- /dev/null +++ b/mcs/class/Mono.Posix/monodroid_Mono.Posix_test.dll.sources @@ -0,0 +1 @@ +#include Mono.Posix_test.dll.sources |