Use available memory instead of physical memory as metric for allocation-heavy tests

We were seeing issues on the new Jenkins Azure boxes which had 7GB of physical memory but only about 1GB free at the time of the test, so it'd fail.
Checking the available memory should fix this.

diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json
index 2e83f9ea795adc63dd194c6b713d067287d871d4..7fcac6c3e9d9cbc50ff1256f936c19d96c01f72b 100644 (file)
--- a/acceptance-tests/SUBMODULES.json
+++ b/acceptance-tests/SUBMODULES.json
@@ -10,7 +10,7 @@
   {
     "name": "coreclr", 
     "url": "git://github.com/mono/coreclr.git", 
-    "rev": "b05c242a59eab1c4ea2803960c8065167308546d", 
+    "rev": "c7da48acf72c40c0c0ed1a80ebfacea21bb3a271", 
     "remote-branch": "origin/mono", 
     "branch": "mono", 
     "directory": "coreclr"
@@ -18,7 +18,7 @@
   {
     "name": "ms-test-suite", 
     "url": "git@github.com:xamarin/ms-test-suite.git", 
-    "rev": "4a95604fdf2c0523e68eaad64a17d22eebb051b3", 
+    "rev": "840653918efed24f00f5e166094f06354cae7255", 
     "remote-branch": "origin/master", 
     "branch": "master", 
     "directory": "ms-test-suite"

diff --git a/mcs/class/corlib/Test/System/StringTest.cs b/mcs/class/corlib/Test/System/StringTest.cs
index a45c7ec198cb62b2fb068a2a13b743b86f535288..be5e7984757b64a30bba3b7274a9f86edfab970f 100644 (file)
--- a/mcs/class/corlib/Test/System/StringTest.cs
+++ b/mcs/class/corlib/Test/System/StringTest.cs
@@ -109,8 +109,8 @@ public class StringTest
                if (!Environment.Is64BitProcess)
                        Assert.Ignore("This test cannot run on a 32-bit system.");
 
-               // Require 6 GB physical RAM, for the 4GB string plus 2GB headroom
-               var pc = new PerformanceCounter ("Mono Memory", "Total Physical Memory");
+               // Require 6 GB available RAM, for the 4GB string plus 2GB headroom
+               var pc = new PerformanceCounter ("Mono Memory", "Available Physical Memory");
 
                if (pc.RawValue < 6L*1024L*1024L*1024L)
                        Assert.Ignore("This machine may not have enough RAM to run this test.");