diff --git a/tests/xharness/Jenkins.cs b/tests/xharness/Jenkins.cs index 8281e0860b..4d6102d9f2 100644 --- a/tests/xharness/Jenkins.cs +++ b/tests/xharness/Jenkins.cs @@ -175,6 +175,7 @@ namespace xharness public string Defines; public string Undefines; public bool Ignored; + public bool EnableSGenConc; public bool UseThumb; public MonoNativeFlavor MonoNativeFlavor; public MonoNativeLinkMode MonoNativeLinkMode; @@ -218,6 +219,7 @@ namespace xharness case "monotouch-test": yield return new TestData { Variation = "Release (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = false, Profiling = false, Defines = "OPTIMIZEALL" }; yield return new TestData { Variation = "Debug (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = true, Profiling = false, Defines = "OPTIMIZEALL" }; + yield return new TestData { Variation = "Debug: SGenConc", MTouchExtraArgs = "", Debug = true, Profiling = false, MonoNativeLinkMode = MonoNativeLinkMode.Static, EnableSGenConc = true}; if (supports_interpreter) { yield return new TestData { Variation = "Debug (interpreter)", MTouchExtraArgs = "--interpreter", Debug = true, Profiling = false, }; yield return new TestData { Variation = "Debug (interpreter -mscorlib)", MTouchExtraArgs = "--interpreter=-mscorlib", Debug = true, Profiling = false, }; @@ -225,6 +227,7 @@ namespace xharness } break; case "mscorlib": + yield return new TestData { Variation = "Debug: SGenConc", MTouchExtraArgs = "", Debug = true, Profiling = false, MonoNativeLinkMode = MonoNativeLinkMode.Static, EnableSGenConc = true}; if (supports_interpreter) { yield return new TestData { Variation = "Debug (interpreter)", MTouchExtraArgs = "--interpreter", Debug = true, Profiling = false, Undefines = "FULL_AOT_RUNTIME" }; yield return new TestData { Variation = "Debug (interpreter -mscorlib)", MTouchExtraArgs = "--interpreter=-mscorlib", Debug = true, Profiling = false, Undefines = "FULL_AOT_RUNTIME" }; @@ -232,6 +235,7 @@ namespace xharness } break; case "mini": + yield return new TestData { Variation = "Debug: SGenConc", MTouchExtraArgs = "", Debug = true, Profiling = false, MonoNativeLinkMode = MonoNativeLinkMode.Static, EnableSGenConc = true}; if (supports_interpreter) { yield return new TestData { Variation = "Debug (interpreter)", MTouchExtraArgs = "--interpreter", Debug = true, Profiling = false, Undefines = "FULL_AOT_RUNTIME" }; yield return new TestData { Variation = "Debug (interpreter -mscorlib)", MTouchExtraArgs = "--interpreter=-mscorlib", Debug = true, Profiling = false, Undefines = "FULL_AOT_RUNTIME" }; @@ -348,6 +352,8 @@ namespace xharness mono_native_link = MonoNativeLinkMode.Static; MonoNativeHelper.AddProjectDefines (clone.Xml, test_data.MonoNativeFlavor, mono_native_link, task.ProjectPlatform, configuration); } + if (test_data.EnableSGenConc) + clone.Xml.SetNode ("MtouchEnableSGenConc", "true", task.ProjectPlatform, configuration); if (test_data.UseThumb) // no need to check the platform, already done at the data iterator clone.Xml.SetNode ("MtouchUseThumb", "true", task.ProjectPlatform, configuration);