[runtime] Use the standard __MOBILE__ define instead of MOBILE for the mini tests.

diff --git a/mono/mini/aot-tests.cs b/mono/mini/aot-tests.cs
index f49afaf84995f41cbc83954a108bd8db98443aff..a7584221453dd1dd822a31fdab7db669343aa516 100644 (file)
--- a/mono/mini/aot-tests.cs
+++ b/mono/mini/aot-tests.cs
@@ -10,13 +10,13 @@ using System.Collections.Generic;
  * Regression tests for the AOT/FULL-AOT code.
  */
 
-#if MOBILE
+#if __MOBILE__
 class AotTests
 #else
 class Tests
 #endif
 {
-#if !MOBILE
+#if !__MOBILE__
        static int Main (String[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }

diff --git a/mono/mini/arrays.cs b/mono/mini/arrays.cs
index 55df1662c34358f3bf3fc345dec84b404e7e8a16..00a3c6b901f86a6b0c92e4b9a2993dbb447f3e78 100644 (file)
--- a/mono/mini/arrays.cs
+++ b/mono/mini/arrays.cs
@@ -23,14 +23,14 @@ using System.Reflection;
  * the IL code looks.
  */
 
-#if MOBILE
+#if __MOBILE__
 class ArrayTests
 #else
 class Tests
 #endif
 {
 
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (string[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }

diff --git a/mono/mini/basic-calls.cs b/mono/mini/basic-calls.cs
index ba0351628184c28297183dfcdd2350bd2a40ed70..ad3cdde59a1f3284f151948cf5441b6910db2fd8 100644 (file)
--- a/mono/mini/basic-calls.cs
+++ b/mono/mini/basic-calls.cs
@@ -23,14 +23,14 @@ using System.Reflection;
  * the IL code looks.
  */
 
-#if MOBILE
+#if __MOBILE__
 class CallsTests
 #else
 class Tests
 #endif
 {
 
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (string[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }

diff --git a/mono/mini/basic-float.cs b/mono/mini/basic-float.cs
index 0eb1e240bc5348d18f4d81badc38b476dee69152..9415256e94fd78049813135bd7df3a1b2e723629 100644 (file)
--- a/mono/mini/basic-float.cs
+++ b/mono/mini/basic-float.cs
@@ -26,14 +26,14 @@ using System.Reflection;
 /* A comparison made to same variable. */
 #pragma warning disable 1718
 
-#if MOBILE
+#if __MOBILE__
 class FloatTests
 #else
 class Tests
 #endif
 {
 
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (string[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }

diff --git a/mono/mini/basic-long.cs b/mono/mini/basic-long.cs
index 1d81232c3a04dbb80a94811fbdf41ee1766f2285..82eb5befe7dd3b2b3a6b1153bf7cc70d65beee1f 100644 (file)
--- a/mono/mini/basic-long.cs
+++ b/mono/mini/basic-long.cs
@@ -23,14 +23,14 @@ using System.Reflection;
  * the IL code looks.
  */
 
-#if MOBILE
+#if __MOBILE__
 class LongTests
 #else
 class Tests
 #endif
 {
 
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (string[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }

diff --git a/mono/mini/basic-math.cs b/mono/mini/basic-math.cs
index 854b21e5868870a4ca21709eff65612f6bdfdcde..9a1fcb9406cd97e0c3887220e7f1df61fdef5600 100644 (file)
--- a/mono/mini/basic-math.cs
+++ b/mono/mini/basic-math.cs
@@ -23,14 +23,14 @@ using System.Reflection;
  * the IL code looks.
  */
 
-#if MOBILE
+#if __MOBILE__
 class MathTests
 #else
 class Tests
 #endif
 {
 
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (string[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }

diff --git a/mono/mini/basic.cs b/mono/mini/basic.cs
index 477af333e9b4a8401a8b6ec5ab4e7646e6044ac3..4cf0e75f5d9cb07ec0ea64bd42d800d95bc4a373 100644 (file)
--- a/mono/mini/basic.cs
+++ b/mono/mini/basic.cs
@@ -23,14 +23,14 @@ using System.Reflection;
  * the IL code looks.
  */
 
-#if MOBILE
+#if __MOBILE__
 class BasicTests
 #else
 class Tests
 #endif
 {
 
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (string[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }

diff --git a/mono/mini/devirtualization.cs b/mono/mini/devirtualization.cs
index 285eb3f49edbf98ae7ac2b47f5e451f6c2c6e3dd..bf1134be6bb765cbed3bab6e178cd595a00106d3 100644 (file)
--- a/mono/mini/devirtualization.cs
+++ b/mono/mini/devirtualization.cs
@@ -193,4 +193,4 @@ class Tests {
                
                return 0;
        }
-}
\ No newline at end of file
+}

diff --git a/mono/mini/exceptions.cs b/mono/mini/exceptions.cs
index 131a9c63a5ce1b69d7cfe3ffb0f9450325c9817a..0148488dee3a3ab0ca92865eaf656c14f4a0fb93 100644 (file)
--- a/mono/mini/exceptions.cs
+++ b/mono/mini/exceptions.cs
@@ -24,14 +24,14 @@ using System.Runtime.CompilerServices;
  * the IL code looks.
  */
 
-#if MOBILE
+#if __MOBILE__
 class ExceptionTests
 #else
 class Tests
 #endif
 {
 
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (string[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }
@@ -2589,7 +2589,7 @@ class Tests
        public static int test_0_lmf_filter () {
                try {
                        // The invoke calls a runtime-invoke wrapper which has a filter clause
-#if MOBILE
+#if __MOBILE__
                        typeof (ExceptionTests).GetMethod ("lmf_filter").Invoke (null, new object [] { });
 #else
                        typeof (Tests).GetMethod ("lmf_filter").Invoke (null, new object [] { });
@@ -2818,8 +2818,8 @@ class Tests
        }
 }
 
-#if !MOBILE
+#if !__MOBILE__
 class ExceptionTests : Tests
 {
 }
-#endif
\ No newline at end of file
+#endif

diff --git a/mono/mini/gc-test.cs b/mono/mini/gc-test.cs
index 50a91fdf2ea4ef97daa5257c588f42ab40ae82de..023a56d716507bda15dc1dc604531d94b82090eb 100644 (file)
--- a/mono/mini/gc-test.cs
+++ b/mono/mini/gc-test.cs
@@ -628,4 +628,4 @@ class Tests {
 
                return (int)lb.o1 + (int)lb.o2 + (int)lb.o3 + (int)lb.o32;
        }
-}
\ No newline at end of file
+}

diff --git a/mono/mini/generics.cs b/mono/mini/generics.cs
index 9d7517e39e35c0aa05dc796db55cac9a700f5c25..04b4e544933452b1f4e56149c235a69c492c0598 100644 (file)
--- a/mono/mini/generics.cs
+++ b/mono/mini/generics.cs
@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 
-#if MOBILE
+#if __MOBILE__
 class GenericsTests
 #else
 class Tests
@@ -21,7 +21,7 @@ class Tests
                }
        }
 
-#if !MOBILE
+#if !__MOBILE__
        class Enumerator <T> : MyIEnumerator <T> {
                T MyIEnumerator<T>.Current {
                        get {
@@ -41,7 +41,7 @@ class Tests
        }
 #endif
 
-#if !MOBILE
+#if !__MOBILE__
        static int Main (string[] args)
        {
                return TestDriver.RunTests (typeof (Tests), args);
@@ -191,7 +191,7 @@ class Tests
        public static int test_0_constrained_vtype_box () {
                GenericClass<TestStruct> t = new GenericClass<TestStruct> ();
 
-#if MOBILE
+#if __MOBILE__
                return t.toString (new TestStruct ()) == "GenericsTests+TestStruct" ? 0 : 1;
 #else
                return t.toString (new TestStruct ()) == "Tests+TestStruct" ? 0 : 1;
@@ -401,7 +401,7 @@ class Tests
                return 0;
        }
 
-#if !MOBILE
+#if !__MOBILE__
        public static int test_0_variance_reflection () {
                // covariance on IEnumerator
                if (!typeof (MyIEnumerator<object>).IsAssignableFrom (typeof (MyIEnumerator<string>)))
@@ -1233,7 +1233,7 @@ class Tests
        }
 }
 
-#if !MOBILE
+#if !__MOBILE__
 class GenericsTests : Tests
 {
 }

diff --git a/mono/mini/gshared.cs b/mono/mini/gshared.cs
index f5ee9bbbf6069effddeddeeed2067809a3058226..c4c6a1ff19654120bb1f9d2c669758082f64eb56 100644 (file)
--- a/mono/mini/gshared.cs
+++ b/mono/mini/gshared.cs
@@ -48,13 +48,13 @@ class GFoo3<T> {
 
 // FIXME: Add mixed ref/noref tests, i.e. Dictionary<string, int>
 
-#if MOBILE
+#if __MOBILE__
 public class GSharedTests
 #else
 public class Tests
 #endif
 {
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (String[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }
@@ -1735,7 +1735,7 @@ public class MobileServiceCollection<TTable, TCol>
        }
 }
 
-#if !MOBILE
+#if !__MOBILE__
 public class GSharedTests : Tests {
 }
 #endif

diff --git a/mono/mini/objects.cs b/mono/mini/objects.cs
index f944713a7bc818e5c711eb7529a2af42e035cb1e..3de372c89d034a04764fadff0a7140974f750e7a 100644 (file)
--- a/mono/mini/objects.cs
+++ b/mono/mini/objects.cs
@@ -26,7 +26,7 @@ using System.Runtime.CompilerServices;
  * the IL code looks.
  */
 
-#if MOBILE
+#if __MOBILE__
 namespace ObjectTests
 {
 #endif
@@ -119,7 +119,7 @@ struct Gamma {
 
 class Tests {
 
-#if !MOBILE
+#if !__MOBILE__
        public static int Main (string[] args) {
                return TestDriver.RunTests (typeof (Tests), args);
        }
@@ -1688,6 +1688,6 @@ ncells ) {
        }
 }
 
-#if MOBILE
+#if __MOBILE__
 }
 #endif