mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.6.0.125

Browse Source 
Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mcs/tools/compiler-tester/compiler-tester.cs
View File

@ -589,13 +589,12 @@ namespace TestRunner {
string[] test_args;
if (test.CompilerOptions != null) {
test_args = new string[2 + test.CompilerOptions.Length];
test_args = new string[1 + test.CompilerOptions.Length];
test.CompilerOptions.CopyTo (test_args, 0);
} else {
test_args = new string[2];
test_args = new string[1];
}
test_args[test_args.Length - 2] = test_args[0];
test_args[test_args.Length - 1] = "-debug";
test_args[test_args.Length - 1] = test_args[0];
test_args[0] = test.FileName;
return tester.Invoke (test_args);
@ -697,11 +696,9 @@ namespace TestRunner {
log_file.WriteLine (msg, rest);
}
public void LogFileLine (string file, string msg, params object [] args)
public void LogFileLine (string file, string msg)
{
string s = verbose ?
string.Format (msg, args) :
file + "...\t" + string.Format (msg, args);
string s = verbose ? msg : file + "...\t" + msg;
Console.WriteLine (s);
if (log_file != null)
@ -871,7 +868,7 @@ namespace TestRunner {
return true;
if (md.ILSize > il_size) {
checker.LogFileLine (test.FileName, "{0} (code size reduction {1} -> {2})", decl_type + ": " + m_name, md.ILSize, il_size);
checker.LogFileLine (test.FileName, string.Format ("{0} (code size reduction {1} -> {2})", decl_type + ": " + m_name, md.ILSize, il_size));
md.ILSize = il_size;
return true;
}
@ -1442,17 +1439,16 @@ namespace TestRunner {
static bool TryToMatchErrorMessage (string actual, string expected)
{
var path_mask_start = expected.IndexOf ("*PATH*");
actual = actual.Replace ("\\", "/");
var path_mask_start = expected.IndexOf ("*PATH*", StringComparison.Ordinal);
if (path_mask_start > 0 && actual.Length > path_mask_start) {
var path_mask_continue = expected.Substring (path_mask_start + 6);
var expected_continue = actual.IndexOf (path_mask_continue, path_mask_start);
if (expected_continue > 0) {
var path = actual.Substring (path_mask_start, expected_continue - path_mask_start);
if (actual == expected.Replace ("*PATH*", path))
return true;
throw new ApplicationException (expected.Replace ("*PATH*", path));
var parts = expected.Split (new [] { "*PATH*" }, StringSplitOptions.None);
foreach (var part in parts) {
if (!actual.Contains (part))
return false;
}
return true;
}
return false;