From 4cc67958432f7aca0009d374c43a7375b46ee126 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 10 Oct 2016 11:27:59 -0500 Subject: [PATCH 1/8] [XM] Teach MacTestMain to look for XM_TEST_NAME to run one test --- tests/common/mac/MacTestMain.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/common/mac/MacTestMain.cs b/tests/common/mac/MacTestMain.cs index c141ae33b6e9..44d5e49aa4ea 100644 --- a/tests/common/mac/MacTestMain.cs +++ b/tests/common/mac/MacTestMain.cs @@ -23,11 +23,12 @@ static void Main(string[] args) static void RunTests() { TestRunner.MainLoop = new NSRunLoopIntegration(); - TestRunner.Main(new[] { - typeof(MainClass).Assembly.Location, - "-labels", - "-noheader" - }); + string testName = System.Environment.GetEnvironmentVariable ("XM_TEST_NAME"); + string [] args = testName != null ? + new [] { typeof(MainClass).Assembly.Location, "-labels", "-noheader", string.Format ("-test={0}", testName) } : + new [] { typeof(MainClass).Assembly.Location, "-labels", "-noheader" }; + + TestRunner.Main (args); } class NSRunLoopIntegration : NSObject, IMainLoopIntegration From 1f702d8d0d628680d0dbe290fd74de6219ed92f3 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Thu, 6 Oct 2016 13:17:41 -0500 Subject: [PATCH 2/8] [XM] Teach launcher to set MONO_CFG_DIR to something reasonable for XM apps - https://bugzilla.xamarin.com/show_bug.cgi?id=44707 - Also teach mmp about MonoBundle/mono/4.5/machine.config file - Mono should be fixed to not need machine.config, but may come up in future - Also allow customers to copy in custom machine.config easily - Also clean up some test output formatting issues found while writing new tests --- runtime/launcher.m | 3 + tests/common/mac/ProjectTestHelpers.cs | 16 +++-- tests/mmptest/src/MMPTest.cs | 87 +++++++++++++++++++++++++- tools/mmp/driver.cs | 19 +++++- tools/mmp/error.cs | 1 + tools/mtouch/error.cs | 1 + 6 files changed, 120 insertions(+), 7 deletions(-) diff --git a/runtime/launcher.m b/runtime/launcher.m index 39ffeb79d78d..58339b5f165e 100644 --- a/runtime/launcher.m +++ b/runtime/launcher.m @@ -311,6 +311,7 @@ // 3) Ensure the following environment variables are set: [...] NSString *res_dir = [data->app_dir stringByAppendingPathComponent: @"Contents/Resources"]; + NSString *monobundle_dir = [data->app_dir stringByAppendingPathComponent: @"Contents/MonoBundle"]; #ifdef DYNAMIC_MONO_RUNTIME NSString *bin_dir = [data->app_dir stringByAppendingPathComponent: @"Contents/MacOS"]; @@ -357,6 +358,8 @@ // So route through MONO_DEBUG setenv ("MONO_DEBUG", "no-gdb-backtrace", 0); } + + setenv ("MONO_CFG_DIR", [monobundle_dir UTF8String], 1); } static void diff --git a/tests/common/mac/ProjectTestHelpers.cs b/tests/common/mac/ProjectTestHelpers.cs index e96a766e8630..9221c6c8abcb 100644 --- a/tests/common/mac/ProjectTestHelpers.cs +++ b/tests/common/mac/ProjectTestHelpers.cs @@ -82,12 +82,12 @@ public static string RunAndAssert (string exe, StringBuilder args, string stepNa { StringBuilder output = new StringBuilder (); Environment.SetEnvironmentVariable ("MONO_PATH", null); - int compileResult = Xamarin.Bundler.Driver.RunCommand (exe, args != null ? args.ToString() : string.Empty, MonoDevelopLike, output, suppressPrintOnErrors: shouldFail); + int compileResult = Xamarin.Bundler.Driver.RunCommand (exe, args != null ? args.ToString() : string.Empty, MonoDevelopLike, output, suppressPrintOnErrors: true); Func getInfo = () => getAdditionalFailInfo != null ? getAdditionalFailInfo() : ""; if (!shouldFail) - Assert.AreEqual (0, compileResult, stepName + " failed: '" + output + "' " + exe + " " + args + getInfo ()); + Assert.AreEqual (0, compileResult, stepName + " failed:\n\n'" + output + "' " + exe + " " + args + getInfo ()); else - Assert.AreNotEqual (0, compileResult, stepName + " did not fail as expected: '" + output + "' " + exe + " " + args + getInfo ()); + Assert.AreNotEqual (0, compileResult, stepName + " did not fail as expected:\n\n'" + output + "' " + exe + " " + args + getInfo ()); return output.ToString (); } @@ -111,11 +111,17 @@ public static string BuildProject (string csprojTarget, bool isUnified, bool sho buildArgs.Append (csprojTarget); + Func getBuildProjectErrorInfo = () => { + string csprojText = "\n\n\n\tCSProj: \n" + File.ReadAllText (csprojTarget); + string csprojLocation = Path.GetDirectoryName (csprojTarget); + string fileList = "\n\n\tFiles: " + String.Join (" ", Directory.GetFiles (csprojLocation).Select (x => x.Replace (csprojLocation + "/", ""))); + return csprojText + fileList; + }; if (isUnified) - return RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/xbuild", buildArgs, "Compile", shouldFail, () => File.ReadAllText (csprojTarget)); + return RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/xbuild", buildArgs, "Compile", shouldFail, getBuildProjectErrorInfo); else - return RunAndAssert ("/Applications/Xamarin Studio.app/Contents/MacOS/mdtool", buildArgs, "Compile", shouldFail, () => File.ReadAllText (csprojTarget)); + return RunAndAssert ("/Applications/Xamarin Studio.app/Contents/MacOS/mdtool", buildArgs, "Compile", shouldFail, getBuildProjectErrorInfo); } static string ProjectTextReplacement (UnifiedTestConfig config, string text) diff --git a/tests/mmptest/src/MMPTest.cs b/tests/mmptest/src/MMPTest.cs index 2e3bb7ba31bb..edfc2ee672b3 100644 --- a/tests/mmptest/src/MMPTest.cs +++ b/tests/mmptest/src/MMPTest.cs @@ -16,6 +16,10 @@ void RunMMPTest (Action test) { string tmpDir = Path.Combine (Path.GetTempPath (), "mmp-test-dir"); try { + // Clean out any existing build there first to prevent strange behavior + if (Directory.Exists (tmpDir)) + Directory.Delete (tmpDir, true); + Directory.CreateDirectory (tmpDir); test (tmpDir); } @@ -380,5 +384,86 @@ static void MonoPosixTestCore (string tmpDir, TI.UnifiedTestConfig test) Assert.IsTrue (File.Exists (Path.Combine (tmpDir, "bin/Debug/XM45Example.app/Contents/MonoBundle/Mono.Posix.dll"))); Assert.IsTrue (File.Exists (Path.Combine (tmpDir, "bin/Debug/XM45Example.app/Contents/MonoBundle/libMonoPosixHelper.dylib"))); } -} + + + const string machineConfigMobileLocation = "bin/Debug/UnifiedExample.app/Contents/MonoBundle/mono/4.5/machine.config"; + const string machineConfigXM45Location = "bin/Debug/XM45Example.app/Contents/MonoBundle/mono/4.5/machine.config"; + + [Test] + public void Unified_ShouldNotGenerateMachineConfigInBundle_WithoutOption() + { + RunMMPTest (tmpDir => { + TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir); + // Mobile + TI.TestUnifiedExecutable (test); + + Assert.IsFalse (File.Exists (Path.Combine (tmpDir, machineConfigMobileLocation))); + + // XM45 + test.XM45 = true; + TI.TestUnifiedExecutable (test); + + Assert.IsFalse (File.Exists (Path.Combine (tmpDir, machineConfigXM45Location))); + }); + } + + [Test] + public void Unified_InvalidCustomMachineConfigInBundle_ThrowsError() + { + RunMMPTest (tmpDir => { + string invalidCustomConfigPath = Path.Combine (tmpDir, "nonexistant/machine.config"); + TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) { + CSProjConfig = string.Format ("--custom-machine-config={0}", invalidCustomConfigPath) + }; + string buildOutput = TI.TestUnifiedExecutable (test, shouldFail : true).BuildOutput; + Assert.IsTrue (buildOutput.Contains ("can not be found"), "Unified_InvalidCustomMachineConfigInBundle_ThrowsError did not error as expected (1):\n\n", buildOutput); + Assert.IsTrue (buildOutput.Contains ("97"), "Unified_InvalidCustomMachineConfigInBundle_ThrowsError did not error as expected (2):\n\n", buildOutput); + }); + } + + [Test] + public void Unified_ShouldGenerateMachineConfigInBundle_WithEmptyOption() + { + RunMMPTest (tmpDir => { + TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) { + CSProjConfig = "--custom-machine-config=\"\"" + }; + TI.TestUnifiedExecutable (test); + Assert.IsTrue (File.Exists (Path.Combine (tmpDir, machineConfigMobileLocation))); + + test.XM45 = true; + TI.TestUnifiedExecutable (test); + Assert.IsTrue (File.Exists (Path.Combine (tmpDir, machineConfigXM45Location))); + }); + } + + [Test] + public void Unified_ShouldGenerateCustomMachineConfigInBundle_WhenPassedIn() + { + RunMMPTest (tmpDir => { + const string customConfigText = "THIS_IS_NOT_A_REAL_CONFIG_FILE"; + string customConfigPath = Path.Combine (tmpDir, "machine.config"); + File.WriteAllLines (customConfigPath, new string [] { customConfigText }); + + TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) { + CSProjConfig = string.Format ("--custom-machine-config={0}", customConfigPath) + }; + + // Mobile + TI.TestUnifiedExecutable (test); + + Assert.IsTrue (File.Exists (Path.Combine (tmpDir, machineConfigMobileLocation))); + string [] text = File.ReadAllLines (Path.Combine (tmpDir, machineConfigMobileLocation)); + Assert.IsTrue (text.Length == 1 && text[0] == customConfigText); + + // XM45 + test.XM45 = true; + TI.TestUnifiedExecutable (test); + + Assert.IsTrue (File.Exists (Path.Combine (tmpDir, machineConfigXM45Location))); + text = File.ReadAllLines (Path.Combine (tmpDir, machineConfigXM45Location)); + Assert.IsTrue (text.Length == 1 && text[0] == customConfigText); + }); + } + } } diff --git a/tools/mmp/driver.cs b/tools/mmp/driver.cs index 960c013edb50..cc82ccc423c8 100644 --- a/tools/mmp/driver.cs +++ b/tools/mmp/driver.cs @@ -81,6 +81,7 @@ public static partial class Driver { static string link_flags = null; static LinkerOptions linker_options; static bool disable_lldb_attach = false; + static string custom_machine_config_path = null; static bool arch_set = false; static string arch = "i386"; @@ -287,7 +288,8 @@ static void Main2 (string [] args) { "http-message-handler=", "Specify the default HTTP Message Handler", v => { http_message_provider = v; }}, { "extension", "Specifies an app extension", v => is_extension = true }, { "allow-unsafe-gac-resolution", "Allow MSBuild to resolve from the System GAC", v => {} , true }, // Used in Xamarin.Mac.XM45.targets and must be ignored here. Hidden since it is a total hack. If you can use it, you don't need support - { "disable-lldb-attach=", "Disable automatic lldb attach on crash", v => disable_lldb_attach = ParseBool (v, "disable_lldb_attach")}, + { "disable-lldb-attach=", "Disable automatic lldb attach on crash", v => disable_lldb_attach = ParseBool (v, "disable-lldb-attach")}, + { "custom-machine-config=", "Custom machine.config file to copy into MonoBundle/mono/4.5/machine.config. Pass \"\" to copy in a valid \"empty\" config file.", v => custom_machine_config_path = v }, }; AddSharedOptions (os); @@ -1498,6 +1500,21 @@ static void CopyConfiguration () { CopyResourceFile ("config", "config"); } + + if (custom_machine_config_path != null) { + string machineConfigDestDir = Path.Combine (mmp_dir, "mono/4.5/"); + string machineConfigDestFile = Path.Combine (machineConfigDestDir, "machine.config"); + + CreateDirectoryIfNeeded (machineConfigDestDir); + if (custom_machine_config_path == String.Empty) { + File.WriteAllLines (machineConfigDestFile, new string [] { "", "", "" }); + } + else { + if (!File.Exists (custom_machine_config_path)) + throw new MonoMacException (97, true, "machine.config file '{0}' can not be found.", custom_machine_config_path); + File.Copy (custom_machine_config_path, machineConfigDestFile); + } + } } static void CopyResourceFile (string streamName, string outputFileName) { diff --git a/tools/mmp/error.cs b/tools/mmp/error.cs index 4cce1d6eed6b..da5dea4b36f8 100644 --- a/tools/mmp/error.cs +++ b/tools/mmp/error.cs @@ -35,6 +35,7 @@ namespace Xamarin.Bundler { // Warning MT0080 Disabling NewRefCount, --new-refcount:false, is deprecated. // MM0088 ** Reserved mtouch ** // MM0089 ** Reserved mtouch ** + // MM0097 machine.config file '{0}' can not be found. // MM1xxx file copy / symlinks (project related) // MM14xx Product assemblies // MM1401 The required '{0}' assembly is missing from the references diff --git a/tools/mtouch/error.cs b/tools/mtouch/error.cs index ce9f1b53a2af..ea330830bdaa 100644 --- a/tools/mtouch/error.cs +++ b/tools/mtouch/error.cs @@ -103,6 +103,7 @@ namespace Xamarin.Bundler { // Warning MT0094 Both profiling (--profiling) and incremental builds (--fastdev) are currently not supported when building for {0}, and incremental builds have been disabled (this will be fixed in a future release). // MT0095 Aot files could not be copied to the destination directory. // MT0096 No reference to Xamarin.iOS.dll was found. + // MT0097 // MT1xxx file copy / symlinks (project related) // MT10xx installer.cs / mtouch.cs // MT1001 Could not find an application at the specified directory: {0} From 565ad6478b3fb70efc34f351f20ba004b47784ec Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 10 Oct 2016 12:39:38 -0500 Subject: [PATCH 3/8] Remove Custom from machine-config option. Fix formatting --- tests/mmptest/src/MMPTest.cs | 30 +++++++++++++++--------------- tools/mmp/driver.cs | 14 +++++++------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/mmptest/src/MMPTest.cs b/tests/mmptest/src/MMPTest.cs index edfc2ee672b3..aa85d7eb8fbc 100644 --- a/tests/mmptest/src/MMPTest.cs +++ b/tests/mmptest/src/MMPTest.cs @@ -390,7 +390,7 @@ static void MonoPosixTestCore (string tmpDir, TI.UnifiedTestConfig test) const string machineConfigXM45Location = "bin/Debug/XM45Example.app/Contents/MonoBundle/mono/4.5/machine.config"; [Test] - public void Unified_ShouldNotGenerateMachineConfigInBundle_WithoutOption() + public void Unified_ShouldNotGenerateMachineConfigInBundle_WithoutOption () { RunMMPTest (tmpDir => { TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir); @@ -408,25 +408,25 @@ public void Unified_ShouldNotGenerateMachineConfigInBundle_WithoutOption() } [Test] - public void Unified_InvalidCustomMachineConfigInBundle_ThrowsError() + public void Unified_InvalidMachineConfigInBundle_ThrowsError () { RunMMPTest (tmpDir => { - string invalidCustomConfigPath = Path.Combine (tmpDir, "nonexistant/machine.config"); + string invalidConfigPath = Path.Combine (tmpDir, "nonexistant/machine.config"); TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) { - CSProjConfig = string.Format ("--custom-machine-config={0}", invalidCustomConfigPath) + CSProjConfig = string.Format ("--machine-config={0}", invalidConfigPath) }; string buildOutput = TI.TestUnifiedExecutable (test, shouldFail : true).BuildOutput; - Assert.IsTrue (buildOutput.Contains ("can not be found"), "Unified_InvalidCustomMachineConfigInBundle_ThrowsError did not error as expected (1):\n\n", buildOutput); - Assert.IsTrue (buildOutput.Contains ("97"), "Unified_InvalidCustomMachineConfigInBundle_ThrowsError did not error as expected (2):\n\n", buildOutput); + Assert.IsTrue (buildOutput.Contains ("can not be found"), "Unified_InvalidMachineConfigInBundle_ThrowsError did not error as expected (1):\n\n", buildOutput); + Assert.IsTrue (buildOutput.Contains ("97"), "Unified_InvalidMachineConfigInBundle_ThrowsError did not error as expected (2):\n\n", buildOutput); }); } [Test] - public void Unified_ShouldGenerateMachineConfigInBundle_WithEmptyOption() + public void Unified_ShouldGenerateMachineConfigInBundle_WithEmptyOption () { RunMMPTest (tmpDir => { TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) { - CSProjConfig = "--custom-machine-config=\"\"" + CSProjConfig = "--machine-config=\"\"" }; TI.TestUnifiedExecutable (test); Assert.IsTrue (File.Exists (Path.Combine (tmpDir, machineConfigMobileLocation))); @@ -438,15 +438,15 @@ public void Unified_ShouldGenerateMachineConfigInBundle_WithEmptyOption() } [Test] - public void Unified_ShouldGenerateCustomMachineConfigInBundle_WhenPassedIn() + public void Unified_ShouldGenerateMachineConfigInBundle_WhenPassedIn () { RunMMPTest (tmpDir => { - const string customConfigText = "THIS_IS_NOT_A_REAL_CONFIG_FILE"; - string customConfigPath = Path.Combine (tmpDir, "machine.config"); - File.WriteAllLines (customConfigPath, new string [] { customConfigText }); + const string configText = "THIS_IS_NOT_A_REAL_CONFIG_FILE"; + string configPath = Path.Combine (tmpDir, "machine.config"); + File.WriteAllLines (configPath, new string [] { configText }); TI.UnifiedTestConfig test = new TI.UnifiedTestConfig (tmpDir) { - CSProjConfig = string.Format ("--custom-machine-config={0}", customConfigPath) + CSProjConfig = string.Format ("--machine-config={0}", configPath) }; // Mobile @@ -454,7 +454,7 @@ public void Unified_ShouldGenerateCustomMachineConfigInBundle_WhenPassedIn() Assert.IsTrue (File.Exists (Path.Combine (tmpDir, machineConfigMobileLocation))); string [] text = File.ReadAllLines (Path.Combine (tmpDir, machineConfigMobileLocation)); - Assert.IsTrue (text.Length == 1 && text[0] == customConfigText); + Assert.IsTrue (text.Length == 1 && text[0] == configText); // XM45 test.XM45 = true; @@ -462,7 +462,7 @@ public void Unified_ShouldGenerateCustomMachineConfigInBundle_WhenPassedIn() Assert.IsTrue (File.Exists (Path.Combine (tmpDir, machineConfigXM45Location))); text = File.ReadAllLines (Path.Combine (tmpDir, machineConfigXM45Location)); - Assert.IsTrue (text.Length == 1 && text[0] == customConfigText); + Assert.IsTrue (text.Length == 1 && text[0] == configText); }); } } diff --git a/tools/mmp/driver.cs b/tools/mmp/driver.cs index cc82ccc423c8..ee69ce40ffe4 100644 --- a/tools/mmp/driver.cs +++ b/tools/mmp/driver.cs @@ -81,7 +81,7 @@ public static partial class Driver { static string link_flags = null; static LinkerOptions linker_options; static bool disable_lldb_attach = false; - static string custom_machine_config_path = null; + static string machine_config_path = null; static bool arch_set = false; static string arch = "i386"; @@ -289,7 +289,7 @@ static void Main2 (string [] args) { "extension", "Specifies an app extension", v => is_extension = true }, { "allow-unsafe-gac-resolution", "Allow MSBuild to resolve from the System GAC", v => {} , true }, // Used in Xamarin.Mac.XM45.targets and must be ignored here. Hidden since it is a total hack. If you can use it, you don't need support { "disable-lldb-attach=", "Disable automatic lldb attach on crash", v => disable_lldb_attach = ParseBool (v, "disable-lldb-attach")}, - { "custom-machine-config=", "Custom machine.config file to copy into MonoBundle/mono/4.5/machine.config. Pass \"\" to copy in a valid \"empty\" config file.", v => custom_machine_config_path = v }, + { "machine-config=", "Custom machine.config file to copy into MonoBundle/mono/4.5/machine.config. Pass \"\" to copy in a valid \"empty\" config file.", v => machine_config_path = v }, }; AddSharedOptions (os); @@ -1501,18 +1501,18 @@ static void CopyConfiguration () { CopyResourceFile ("config", "config"); } - if (custom_machine_config_path != null) { + if (machine_config_path != null) { string machineConfigDestDir = Path.Combine (mmp_dir, "mono/4.5/"); string machineConfigDestFile = Path.Combine (machineConfigDestDir, "machine.config"); CreateDirectoryIfNeeded (machineConfigDestDir); - if (custom_machine_config_path == String.Empty) { + if (machine_config_path == String.Empty) { File.WriteAllLines (machineConfigDestFile, new string [] { "", "", "" }); } else { - if (!File.Exists (custom_machine_config_path)) - throw new MonoMacException (97, true, "machine.config file '{0}' can not be found.", custom_machine_config_path); - File.Copy (custom_machine_config_path, machineConfigDestFile); + if (!File.Exists (machine_config_path)) + throw new MonoMacException (97, true, "machine.config file '{0}' can not be found.", machine_config_path); + File.Copy (machine_config_path, machineConfigDestFile); } } } From 7c3559e2514704e14cdf0629f33c56cc74d34f01 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Mon, 10 Oct 2016 13:48:27 -0500 Subject: [PATCH 4/8] Revert accidently suppressPrintOnErrors change --- tests/common/mac/ProjectTestHelpers.cs | 2 +- tests/foo.sh | 101 +++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100755 tests/foo.sh diff --git a/tests/common/mac/ProjectTestHelpers.cs b/tests/common/mac/ProjectTestHelpers.cs index 9221c6c8abcb..878d9c804117 100644 --- a/tests/common/mac/ProjectTestHelpers.cs +++ b/tests/common/mac/ProjectTestHelpers.cs @@ -82,7 +82,7 @@ public static string RunAndAssert (string exe, StringBuilder args, string stepNa { StringBuilder output = new StringBuilder (); Environment.SetEnvironmentVariable ("MONO_PATH", null); - int compileResult = Xamarin.Bundler.Driver.RunCommand (exe, args != null ? args.ToString() : string.Empty, MonoDevelopLike, output, suppressPrintOnErrors: true); + int compileResult = Xamarin.Bundler.Driver.RunCommand (exe, args != null ? args.ToString() : string.Empty, MonoDevelopLike, output, suppressPrintOnErrors: shouldFail); Func getInfo = () => getAdditionalFailInfo != null ? getAdditionalFailInfo() : ""; if (!shouldFail) Assert.AreEqual (0, compileResult, stepName + " failed:\n\n'" + output + "' " + exe + " " + args + getInfo ()); diff --git a/tests/foo.sh b/tests/foo.sh new file mode 100755 index 000000000000..dcb3e7e61a93 --- /dev/null +++ b/tests/foo.sh @@ -0,0 +1,101 @@ +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest +make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest From fd9d4d0ae8427f4e4e76fd5fd79311d5c2cd3037 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Tue, 11 Oct 2016 10:44:31 -0500 Subject: [PATCH 5/8] Change MONO_CFG_DIR setenv to not overwrite as requested --- runtime/launcher.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/launcher.m b/runtime/launcher.m index 58339b5f165e..d5d4bd337e20 100644 --- a/runtime/launcher.m +++ b/runtime/launcher.m @@ -359,7 +359,7 @@ setenv ("MONO_DEBUG", "no-gdb-backtrace", 0); } - setenv ("MONO_CFG_DIR", [monobundle_dir UTF8String], 1); + setenv ("MONO_CFG_DIR", [monobundle_dir UTF8String], 0); } static void From a294d573f212b7ece5916192fec2b3901fede70d Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Tue, 11 Oct 2016 10:45:13 -0500 Subject: [PATCH 6/8] Remove accidental test script --- tests/foo.sh | 101 --------------------------------------------------- 1 file changed, 101 deletions(-) delete mode 100755 tests/foo.sh diff --git a/tests/foo.sh b/tests/foo.sh deleted file mode 100755 index dcb3e7e61a93..000000000000 --- a/tests/foo.sh +++ /dev/null @@ -1,101 +0,0 @@ -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest -make XM_TEST_NAME=Xamarin.Mac.Tests.DelegateAndDataSourceTest run-mac-classic-apitest From 6c7d3fe8217cd69ca01098be3563d540d9581143 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Wed, 12 Oct 2016 11:07:14 -0500 Subject: [PATCH 7/8] Add hack for F# builds in tests - FSharp tests will fail to build inside msbuild-test with: /Library/Frameworks/Mono.framework/Versions/4.4.0/lib/mono/4.5/Microsoft.FSharp.Targets: error : Error executing task Fsc: ToolPath is unknown; specify the path to fsc.exe as the ToolPath property. - So we unset MONO_CFG_DIR when we setup the other environomental variables, which was setup by the test launcher in launcher.m --- tests/common/mac/ProjectTestHelpers.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/common/mac/ProjectTestHelpers.cs b/tests/common/mac/ProjectTestHelpers.cs index 878d9c804117..cb7fab00c6f4 100644 --- a/tests/common/mac/ProjectTestHelpers.cs +++ b/tests/common/mac/ProjectTestHelpers.cs @@ -101,6 +101,9 @@ public static string BuildProject (string csprojTarget, bool isUnified, bool sho Environment.SetEnvironmentVariable ("MSBuildExtensionsPath", rootDirectory + "/Library/Frameworks/Mono.framework/External/xbuild"); Environment.SetEnvironmentVariable ("XAMMAC_FRAMEWORK_PATH", rootDirectory + "/Library/Frameworks/Xamarin.Mac.framework/Versions/Current"); + // FSharp tests will fail if this is set + Environment.SetEnvironmentVariable ("MONO_CFG_DIR", ""); + // This is to force build to use our mmp and not system mmp StringBuilder buildArgs = new StringBuilder (); if (isUnified) { From dd52a0e1ed8c2f3a0049facb4aa2712a809fde65 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Thu, 13 Oct 2016 09:22:12 -0500 Subject: [PATCH 8/8] Unset MONO_CFG_DIR to prevent leakage into user applications - Remove hack in tests since we've moved into all apps - Was breaking xbuild building fsharp inside any XM app --- src/AppKit/NSApplication.cs | 4 ++++ tests/common/mac/ProjectTestHelpers.cs | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/AppKit/NSApplication.cs b/src/AppKit/NSApplication.cs index 98c34a3597a9..2eada1d5da8b 100644 --- a/src/AppKit/NSApplication.cs +++ b/src/AppKit/NSApplication.cs @@ -68,6 +68,10 @@ public static void Init () // that don't call Main. NSApplication.mainThread = Thread.CurrentThread; + // Launcher sets this to work around https://bugzilla.xamarin.com/show_bug.cgi?id=45279 + // But can affect child xbuild processes, so unset + Environment.SetEnvironmentVariable ("MONO_CFG_DIR", ""); + // TODO: // Install hook to register dynamically loaded assemblies } diff --git a/tests/common/mac/ProjectTestHelpers.cs b/tests/common/mac/ProjectTestHelpers.cs index cb7fab00c6f4..878d9c804117 100644 --- a/tests/common/mac/ProjectTestHelpers.cs +++ b/tests/common/mac/ProjectTestHelpers.cs @@ -101,9 +101,6 @@ public static string BuildProject (string csprojTarget, bool isUnified, bool sho Environment.SetEnvironmentVariable ("MSBuildExtensionsPath", rootDirectory + "/Library/Frameworks/Mono.framework/External/xbuild"); Environment.SetEnvironmentVariable ("XAMMAC_FRAMEWORK_PATH", rootDirectory + "/Library/Frameworks/Xamarin.Mac.framework/Versions/Current"); - // FSharp tests will fail if this is set - Environment.SetEnvironmentVariable ("MONO_CFG_DIR", ""); - // This is to force build to use our mmp and not system mmp StringBuilder buildArgs = new StringBuilder (); if (isUnified) {