Merge pull request #6209 from spouliot/xcode11-backport-xtro

[tests] Backport xtro changes to xcode11

tests/xtro-sharpie/xtro-sanity/Sanitizer.cs

@@ -189,6 +189,7 @@ namespace Extrospection {
 					else
 						raws [i] = new List<string> ();
 				}
+				var failures = new List<string> ();
 				foreach (var entry in common) {
 					if (!entry.StartsWith ("!", StringComparison.Ordinal))
 						continue;
@@ -198,8 +199,16 @@ namespace Extrospection {
 						if (found)
 							break;
 					}
-					if (!found)
+					if (!found) {
 						Log ($"?unknown-entry? {entry} in 'common-{fx}.ignore'");
+						failures.Add (entry);
+					}
+				}
+				if (failures.Count > 0 && !string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("AUTO_SANITIZE"))) {
+					var sanitized = new List<string> (common);
+					foreach (var failure in failures)
+						sanitized.Remove (failure);
+					File.WriteAllLines (Path.Combine (directory, $"common-{fx}.ignore"), sanitized);
 				}
 			}
 			// * a platform ignore must existing in it's corresponding raw file
@@ -211,13 +220,22 @@ namespace Extrospection {
 				if (!shortname.Contains ("-"))
 					continue;
 				var rawfile = Path.ChangeExtension (file, ".raw");
-				var raws = new List<string> (File.ReadAllLines (rawfile));
-				foreach (var entry in File.ReadAllLines (file)) {
+				var raws = new List<string> (File.Exists (rawfile) ? File.ReadAllLines (rawfile) : Array.Empty<string> ());
+				var failures = new List<string> ();
+				var lines = File.ReadAllLines (file);
+				foreach (var entry in lines) {
 					if (!entry.StartsWith ("!", StringComparison.Ordinal))
 						continue;
 					if (raws.Contains (entry))
 						continue;
 					Log ($"?unknown-entry? {entry} in '{shortname}'");
+					failures.Add (entry);
+				}
+				if (failures.Count > 0 && !string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("AUTO_SANITIZE"))) {
+					var sanitized = new List<string> (lines);
+					foreach (var failure in failures)
+						sanitized.Remove (failure);
+					File.WriteAllLines (file, sanitized);
 				}
 			}