From 709871bd6e9fff243cc791a7599e626f7c7e5a24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sat, 22 Jul 2017 15:58:54 +0200 Subject: [PATCH] [acceptance-tests] Disable the ironjs-v8 test on arm32/arm64. It times out even with a 24-hour timeout. Eventually we should investigate why, but disable it for now so the lane can become green. --- acceptance-tests/profiler-stress.mk | 2 +- acceptance-tests/profiler-stress/runner.cs | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/acceptance-tests/profiler-stress.mk b/acceptance-tests/profiler-stress.mk index b2ff164cade..dd819d397cc 100644 --- a/acceptance-tests/profiler-stress.mk +++ b/acceptance-tests/profiler-stress.mk @@ -9,5 +9,5 @@ SYS_REFS = \ check-profiler-stress: @$(MAKE) validate-benchmarker RESET_VERSIONS=1 - cd profiler-stress && $(MCS) -debug -target:exe $(addprefix -r:, $(SYS_REFS)) -out:runner.exe @runner.exe.sources + cd profiler-stress && $(MCS) -debug -define:ARCH_$(arch_target) -target:exe $(addprefix -r:, $(SYS_REFS)) -out:runner.exe @runner.exe.sources cd profiler-stress && $(RUNTIME) runner.exe diff --git a/acceptance-tests/profiler-stress/runner.cs b/acceptance-tests/profiler-stress/runner.cs index 69ba9e5ab0a..05a1efb3514 100644 --- a/acceptance-tests/profiler-stress/runner.cs +++ b/acceptance-tests/profiler-stress/runner.cs @@ -59,7 +59,11 @@ namespace Mono.Profiling.Tests.Stress { static readonly TimeSpan _timeout = TimeSpan.FromHours (8); - static readonly Dictionary> _processors = new Dictionary> () { + static readonly Dictionary> _filters = new Dictionary> { + { "ironjs-v8", FilterArmArchitecture }, + }; + + static readonly Dictionary> _processors = new Dictionary> { { "msbiology", Process32BitOutOfMemory }, }; @@ -67,6 +71,15 @@ namespace Mono.Profiling.Tests.Stress { return Regex.Replace (text, @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]", string.Empty); } + static bool FilterArmArchitecture (Benchmark benchmark) + { +#if ARCH_arm || ARCH_arm64 + return false; +#else + return true; +#endif + } + static void Process32BitOutOfMemory (TestResult result) { if (Environment.Is64BitProcess) @@ -79,6 +92,11 @@ namespace Mono.Profiling.Tests.Stress { result.ExitCode = 0; } + static bool IsSupported (Benchmark benchmark) + { + return _filters.TryGetValue (benchmark.Name, out var filter) ? filter (benchmark) : true; + } + static int Main () { var depDir = Path.Combine ("..", "external", "benchmarker"); @@ -87,7 +105,7 @@ namespace Mono.Profiling.Tests.Stress { var benchmarks = Directory.EnumerateFiles (benchDir, "*.benchmark") .Select (Benchmark.Load) - .Where (b => !b.OnlyExplicit && b.ClientCommandLine == null) + .Where (b => !b.OnlyExplicit && b.ClientCommandLine == null && IsSupported (b)) .OrderBy (b => b.Name) .ToArray (); -- 2.25.1