diff --git a/pkg/test_runner/lib/src/configuration.dart b/pkg/test_runner/lib/src/configuration.dart index 010f0005aa2c..065f180d9f84 100644 --- a/pkg/test_runner/lib/src/configuration.dart +++ b/pkg/test_runner/lib/src/configuration.dart @@ -245,7 +245,7 @@ class TestConfiguration { arch: architecture, system: system); - _timeout = 60 * compilerMultiplier * runtimeMultiplier; + _timeout = 30 * compilerMultiplier * runtimeMultiplier; } } diff --git a/pkg/test_runner/lib/src/runtime_configuration.dart b/pkg/test_runner/lib/src/runtime_configuration.dart index de784ee233ab..e9c59b869ac5 100644 --- a/pkg/test_runner/lib/src/runtime_configuration.dart +++ b/pkg/test_runner/lib/src/runtime_configuration.dart @@ -356,6 +356,9 @@ class DartVmRuntimeConfiguration extends RuntimeConfiguration { if (arch == Architecture.ia32) { multiplier *= 2; } + if (arch == Architecture.x64 && system == System.mac) { + multiplier *= 2; // Older, slower machines. + } if (mode.isDebug) { multiplier *= 2; diff --git a/runtime/tests/vm/vm.status b/runtime/tests/vm/vm.status index 9c8833476ddd..ae99e70687e6 100644 --- a/runtime/tests/vm/vm.status +++ b/runtime/tests/vm/vm.status @@ -13,6 +13,7 @@ cc/IsolateReload_PendingUnqualifiedCall_InstanceToStatic: Fail # Issue 32981 cc/IsolateReload_PendingUnqualifiedCall_StaticToInstance: Fail # Issue 32981 cc/TTS_STC_ManyAsserts: Pass, Slow # Generates 10k classes that are put into an STC via assert checks. dart/analyze_snapshot_binary_test: Pass, Slow # Runs various subprocesses for testing AOT. +dart/async_igoto_threshold_flag_test: Pass, Slow dart/boxmint_test: Pass, Slow # Uses slow path dart/byte_array_optimized_test: Pass, Slow dart/byte_array_test: Pass, Slow # Uses --opt-counter-threshold=10 @@ -30,6 +31,7 @@ dart/print_object_layout_test: Pass, Slow # Spawns several subprocesses dart/regress32619_test: Pass, Slow dart/slow_path_shared_stub_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag. dart/snapshot_version_test: Skip # This test is a Dart1 test (script snapshot) +dart/spawn_uri_aot_test: Pass, Slow # Runs various subprocesses for testing AOT. dart/stack_overflow_shared_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag. [ $arch == ia32 ] diff --git a/tests/co19/co19-runtime.status b/tests/co19/co19-runtime.status index 3f8d75a18d80..cf9e2ac6f537 100644 --- a/tests/co19/co19-runtime.status +++ b/tests/co19/co19-runtime.status @@ -3,6 +3,7 @@ # BSD-style license that can be found in the LICENSE file. [ $system == windows ] +LibTest/io/FileSystemModifyEvent/contentChanged_A01_t01: Pass, Slow LibTest/io/ProcessResult/exitCode_A01_t02: Skip # Issue 32138 LibTest/io/Stdin/readByteSync_A01_t01: Skip # Issue 32138 LibTest/io/Stdin/readByteSync_A01_t02: Skip # Issue 32138