diff --git a/pkg/smith/lib/configuration.dart b/pkg/smith/lib/configuration.dart index 07a761898a5..85a11f3f0ba 100644 --- a/pkg/smith/lib/configuration.dart +++ b/pkg/smith/lib/configuration.dart @@ -123,7 +123,7 @@ class Configuration { T? fromName; for (var value in allowed) { // Don't treat "none" as matchable since it's ambiguous as to whether - // it refers to compiler or runtime. + // it refers to runtime or sanitizer. if (value == "none") continue; if (words.contains(value)) { @@ -625,7 +625,6 @@ class Architecture extends NamedEnum { } class Compiler extends NamedEnum { - static const none = Compiler._('none'); static const dart2js = Compiler._('dart2js'); static const dart2analyzer = Compiler._('dart2analyzer'); static const dart2wasm = Compiler._('dart2wasm'); @@ -640,7 +639,6 @@ class Compiler extends NamedEnum { static final List names = _all.keys.toList(); static final _all = Map.fromIterable([ - none, dart2js, dart2analyzer, dart2wasm, @@ -712,8 +710,6 @@ class Compiler extends NamedEnum { return const [Runtime.none]; case Compiler.fasta: return const [Runtime.none]; - case Compiler.none: - return const [Runtime.vm, Runtime.flutter]; } throw "unreachable"; @@ -740,8 +736,6 @@ class Compiler extends NamedEnum { case Compiler.specParser: case Compiler.fasta: return Runtime.none; - case Compiler.none: - return Runtime.vm; } throw "unreachable"; @@ -880,7 +874,7 @@ class Runtime extends NamedEnum { switch (this) { case vm: case flutter: - return Compiler.none; + return Compiler.dartk; case dartPrecompiled: return Compiler.dartkp; diff --git a/pkg/smith/test/configuration_test.dart b/pkg/smith/test/configuration_test.dart index 7a5b4244228..566148ecd51 100644 --- a/pkg/smith/test/configuration_test.dart +++ b/pkg/smith/test/configuration_test.dart @@ -171,7 +171,7 @@ void main() { }); test("compiler defaults to runtime's default compiler", () { - expect(Configuration.parse("vm", {}).compiler, equals(Compiler.none)); + expect(Configuration.parse("vm", {}).compiler, equals(Compiler.dartk)); }); test("mode defaults to compiler's default mode", () { diff --git a/pkg/test_runner/bin/launch_browser.dart b/pkg/test_runner/bin/launch_browser.dart index ba4da38e6ef..4857bbc3278 100644 --- a/pkg/test_runner/bin/launch_browser.dart +++ b/pkg/test_runner/bin/launch_browser.dart @@ -34,7 +34,7 @@ void main(List arguments) { var runtime = Runtime.find(name); var configuration = TestConfiguration( configuration: Configuration("dummy-configuration", Architecture.x64, - Compiler.none, Mode.release, runtime, System.host), + Compiler.dartk, Mode.release, runtime, System.host), outputDirectory: 'dummy', reproducingArguments: []); var browser = Browser.fromConfiguration(configuration); diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart index 18f751d50f3..7afaeaab72c 100644 --- a/pkg/test_runner/lib/src/compiler_configuration.dart +++ b/pkg/test_runner/lib/src/compiler_configuration.dart @@ -114,9 +114,6 @@ abstract class CompilerConfiguration { case Compiler.fasta: return FastaCompilerConfiguration(configuration); - - case Compiler.none: - return NoneCompilerConfiguration(configuration); } throw "unreachable"; diff --git a/pkg/test_runner/lib/src/options.dart b/pkg/test_runner/lib/src/options.dart index a87b1e412bc..073675836f6 100644 --- a/pkg/test_runner/lib/src/options.dart +++ b/pkg/test_runner/lib/src/options.dart @@ -73,7 +73,6 @@ class OptionsParser { abbr: 'c', allowed: Compiler.names, help: '''How the Dart code should be compiled or statically processed. -none: Do not compile the Dart code. dart2js: Compile to JavaScript using dart2js. dart2analyzer: Perform static analysis on Dart code using the analyzer. compare_analyzer_cfe: Compare analyzer and common front end representations. diff --git a/pkg/test_runner/lib/src/test_configurations.dart b/pkg/test_runner/lib/src/test_configurations.dart index 607d888be46..5de2eb9014a 100644 --- a/pkg/test_runner/lib/src/test_configurations.dart +++ b/pkg/test_runner/lib/src/test_configurations.dart @@ -153,8 +153,7 @@ Future testConfigurations(List configurations) async { for (var key in configuration.selectors.keys) { if (key == 'co19_2' || key == 'co19') { testSuites.add(Co19TestSuite(configuration, key)); - } else if ((configuration.compiler == Compiler.none || - configuration.compiler == Compiler.dartk) && + } else if (configuration.compiler == Compiler.dartk && configuration.runtime == Runtime.vm && key == 'vm') { // vm tests contain both cc tests (added here) and dart tests (added diff --git a/pkg/test_runner/lib/src/test_suite.dart b/pkg/test_runner/lib/src/test_suite.dart index 3688b5c2331..517fb036db5 100644 --- a/pkg/test_runner/lib/src/test_suite.dart +++ b/pkg/test_runner/lib/src/test_suite.dart @@ -1027,7 +1027,6 @@ class StandardTestSuite extends TestSuite { List> getVmOptions(TestFile testFile) { const compilers = [ - Compiler.none, Compiler.dartk, Compiler.dartkp, Compiler.appJitk, diff --git a/runtime/observatory/tests/service/service.status b/runtime/observatory/tests/service/service.status index 0b85116f946..88e810653a3 100644 --- a/runtime/observatory/tests/service/service.status +++ b/runtime/observatory/tests/service/service.status @@ -38,11 +38,7 @@ dev_fs_http_put_weird_char_test: Skip # Windows disallows carriage returns in pa dev_fs_weird_char_test: Skip # Windows disallows question mark in paths uri_mappings_lookup_test: SkipByDesign # Relies on file paths in the SDK. -[ $compiler == none && $runtime == vm ] -evaluate_activation_test/instance: RuntimeError # http://dartbug.com/20047 -evaluate_activation_test/scope: RuntimeError # http://dartbug.com/20047 - -[ $compiler == none && $runtime == vm && $system == fuchsia ] +[ $compiler == dartk && $runtime == vm && $system == fuchsia ] *: Skip # Not yet triaged. [ $mode == debug && $system == windows ] diff --git a/runtime/observatory_2/tests/service_2/service_2.status b/runtime/observatory_2/tests/service_2/service_2.status index d56e17cc268..d2b1998360d 100644 --- a/runtime/observatory_2/tests/service_2/service_2.status +++ b/runtime/observatory_2/tests/service_2/service_2.status @@ -44,11 +44,7 @@ uri_mappings_lookup_test: SkipByDesign # Relies on file paths in the SDK. [ $arch == ia32 && $mode == debug ] break_on_function_many_child_isolates_test: Skip # Times out anyway, so skipping to reduce chance of shard timeout. -[ $compiler == none && $runtime == vm ] -evaluate_activation_test/instance: RuntimeError # http://dartbug.com/20047 -evaluate_activation_test/scope: RuntimeError # http://dartbug.com/20047 - -[ $compiler == none && $runtime == vm && $system == fuchsia ] +[ $compiler == dartk && $runtime == vm && $system == fuchsia ] *: Skip # Not yet triaged. [ $mode == debug && $system == windows ] diff --git a/runtime/tests/vm/vm.status b/runtime/tests/vm/vm.status index ebe20ae4d7c..0394a42c805 100644 --- a/runtime/tests/vm/vm.status +++ b/runtime/tests/vm/vm.status @@ -107,12 +107,24 @@ cc/IsolateReload_KernelIncrementalCompileExpression: SkipByDesign cc/IsolateReload_KernelIncrementalCompileGenerics: SkipByDesign cc/Mixin_PrivateSuperResolution: Skip cc/Mixin_PrivateSuperResolutionCrossLibraryShouldFail: Skip +dart/appjit*: SkipByDesign # Test needs to run from source dart/b162922506_test: SkipByDesign # Only run in JIT dart/entrypoints/jit/*: SkipByDesign # These tests should only run on JIT. +dart/kernel_determinism_test: SkipByDesign # Test needs to run from source +dart/minimal_kernel_test: SkipByDesign # Test needs to run from source +dart/null_safety_autodetection_in_kernel_compiler_test: SkipByDesign # Test needs to run from source +dart/regress_44026_test: SkipByDesign # Test needs to run from source +dart/snapshot_depfile_test: SkipByDesign # Test needs to run from source dart/spawn_uri_from_kernel_blob_test: SkipByDesign # Only run in JIT. +dart/type_casts_with_null_safety_autodetection_test: SkipByDesign # Test needs to run from source +dart_2/appjit*: SkipByDesign # Test needs to run from source dart_2/b162922506_test: SkipByDesign # Only run in JIT dart_2/entrypoints/jit/*: SkipByDesign # These tests should only run on JIT. dart_2/isolates/reload_*: SkipByDesign # These tests only run on normal JIT. +dart_2/kernel_determinism_test: SkipByDesign # Test needs to run from source +dart_2/minimal_kernel_test: SkipByDesign # Test needs to run from source +dart_2/null_safety_autodetection_in_kernel_compiler_test: SkipByDesign # Test needs to run from source +dart_2/snapshot_depfile_test: SkipByDesign # Test needs to run from source [ $compiler == dartkp ] dart/causal_stacks/async_throws_stack_no_causal_non_symbolic_test: SkipByDesign # --no-lazy... does nothing on precompiler. @@ -293,20 +305,6 @@ dart_2/heap_snapshot_referrers_test: SkipSlow dart_2/isolates/reload_many_isolates_live_and_die_test: SkipSlow # The test itself does reloading of subprocesses. dart_2/kernel_determinism_test: SkipSlow -[ $compiler != dartk && $compiler != none ] -dart/appjit*: SkipByDesign # Test needs to run from source -dart/kernel_determinism_test: SkipByDesign # Test needs to run from source -dart/minimal_kernel_test: SkipByDesign # Test needs to run from source -dart/null_safety_autodetection_in_kernel_compiler_test: SkipByDesign # Test needs to run from source -dart/regress_44026_test: SkipByDesign # Test needs to run from source -dart/snapshot_depfile_test: SkipByDesign # Test needs to run from source -dart/type_casts_with_null_safety_autodetection_test: SkipByDesign # Test needs to run from source -dart_2/appjit*: SkipByDesign # Test needs to run from source -dart_2/kernel_determinism_test: SkipByDesign # Test needs to run from source -dart_2/minimal_kernel_test: SkipByDesign # Test needs to run from source -dart_2/null_safety_autodetection_in_kernel_compiler_test: SkipByDesign # Test needs to run from source -dart_2/snapshot_depfile_test: SkipByDesign # Test needs to run from source - [ $compiler == dartkp && $system == windows ] dart/isolates/dart_api_create_lightweight_isolate_test: SkipByDesign # https://dartbug.com/40579 Dart C API symbols not available. dart_2/isolates/dart_api_create_lightweight_isolate_test: SkipByDesign # https://dartbug.com/40579 Dart C API symbols not available. diff --git a/samples/samples.status b/samples/samples.status index f119b0ef8a2..bc4ff0be77f 100644 --- a/samples/samples.status +++ b/samples/samples.status @@ -14,10 +14,7 @@ sample_extension/test/sample_extension_app_snapshot_test: SkipByDesign # This te [ $compiler == dart2js && $runtime == none ] *: Fail, Pass # TODO(ahe): Triage these tests. -[ $compiler == none && $mode == debug && $runtime == vm && $system == windows ] -sample_extension/test/sample_extension_app_snapshot_test: Pass, RuntimeError # Issue 28842 - -[ $compiler == none && $runtime == vm && $system == fuchsia ] +[ $compiler == dartk && $runtime == vm && $system == fuchsia ] *: Skip # Not yet triaged. [ $arch == simarm || $arch == simarm64 || $arch == simarm64c || $arch == simriscv32 || $arch == simriscv64 ] diff --git a/tests/corelib/corelib.status b/tests/corelib/corelib.status index dbc80b99788..f4bb4be8f85 100644 --- a/tests/corelib/corelib.status +++ b/tests/corelib/corelib.status @@ -32,12 +32,6 @@ bigint_js_test: SkipByDesign # JavaScript-specific test [ $compiler == dart2js && $runtime != none ] regexp/pcre_test: Slow, Pass # Issue 21593 -# We no longer expect Dart2 tests to run with the standalone VM without the new -# common front end, but for now we get better coverage by still running them in -# checked mode, which is mostly Dart2-compatible. -[ $compiler == none && !$checked && ($runtime == dart_precompiled || $runtime == vm) ] -*: SkipByDesign - [ $runtime != dart_precompiled && $runtime != vm ] reg_exp_receive_port_test: SkipByDesign # uses SendPort/ReceivePort diff --git a/tests/corelib_2/corelib_2.status b/tests/corelib_2/corelib_2.status index 1c832d50b33..ac71c613549 100644 --- a/tests/corelib_2/corelib_2.status +++ b/tests/corelib_2/corelib_2.status @@ -38,12 +38,6 @@ bigint_js_test: SkipByDesign # JavaScript-specific test [ $compiler == dart2js && $runtime != none ] regexp/pcre_test: Slow, Pass # Issue 21593 -# We no longer expect Dart2 tests to run with the standalone VM without the new -# common front end, but for now we get better coverage by still running them in -# checked mode, which is mostly Dart2-compatible. -[ $compiler == none && !$checked && ($runtime == dart_precompiled || $runtime == vm) ] -*: SkipByDesign - [ $runtime != dart_precompiled && $runtime != vm ] reg_exp_receive_port_test: SkipByDesign # uses SendPort/ReceivePort diff --git a/tests/language/language.status b/tests/language/language.status index 4fb55210460..ed161c8cd9b 100644 --- a/tests/language/language.status +++ b/tests/language/language.status @@ -11,10 +11,6 @@ switch/case_warn_test: Skip # Analyzer only, see language_analyzer2.status [ $compiler != fasta ] value_class/*: Skip # Internship, jlcontreras -[ $compiler == none ] -invalid_returns/*: Skip # https://github.com/dart-lang/sdk/issues/34013 -void/*: Skip # https://github.com/dart-lang/sdk/issues/34013 - [ $compiler == spec_parser ] double_literals/*: Skip # https://github.com/dart-lang/sdk/issues/34355 invalid_returns/*: Skip # https://github.com/dart-lang/sdk/issues/34015 diff --git a/tests/language_2/language_2.status b/tests/language_2/language_2.status index 73197d5e948..a3eb4bd9ab0 100644 --- a/tests/language_2/language_2.status +++ b/tests/language_2/language_2.status @@ -5,10 +5,6 @@ [ $compiler != dart2analyzer ] switch/case_warn_test: Skip # Analyzer only, see language_analyzer2.status -[ $compiler == none ] -invalid_returns/*: Skip # https://github.com/dart-lang/sdk/issues/34013 -void/*: Skip # https://github.com/dart-lang/sdk/issues/34013 - [ $compiler == spec_parser ] double_literals/*: Skip # https://github.com/dart-lang/sdk/issues/34355 invalid_returns/*: Skip # https://github.com/dart-lang/sdk/issues/34015 diff --git a/tests/lib/lib.status b/tests/lib/lib.status index 921086b2bab..25070bef797 100644 --- a/tests/lib/lib.status +++ b/tests/lib/lib.status @@ -73,7 +73,7 @@ html/canvasrendering/pixel_manipulation_test: Skip # Issue 42048 html/request_animation_frame_test: Skip # Times out. Issue 22167 html/transition_event_test: Skip # Times out. Issue 22167 -[ $runtime != dart_precompiled && ($runtime != vm || $compiler != dartk && $compiler != none) ] +[ $runtime != dart_precompiled && ($compiler != dartk || $runtime != vm) ] isolate/vm_rehash_test: SkipByDesign [ $arch == simarm64 || $arch == simarm64c || $arch == simriscv32 || $arch == simriscv64 ] @@ -82,6 +82,13 @@ convert/utf85_test: Skip # Pass, Slow Issue 20111. [ $arch != x64 || $runtime != vm ] isolate/int32_length_overflow_test: SkipSlow +[ $compiler != dartk || $runtime != vm ] +isolate/package_config_test: SkipByDesign # Uses Isolate.packageConfig +isolate/package_resolve_test: SkipByDesign # Uses Isolate.resolvePackageUri +isolate/package_root_test: SkipByDesign # Uses Isolate.packageRoot +isolate/scenarios/*: SkipByDesign # Use automatic package resolution, spawnFunction and .dart URIs. +isolate/spawn_uri_fail_test: SkipByDesign # Uses dart:io. + [ $runtime == chrome || $runtime == ff ] async/slow_consumer2_test: SkipSlow # Times out. Issue 22050 async/stream_timeout_test: SkipSlow # Times out. Issue 22050 @@ -139,13 +146,6 @@ isolate/stacktrace_message_test: Skip # Isolate.spawnUri isolate/static_function_test: Skip # Isolate.spawnUri isolate/unresolved_ports_test: Skip # Isolate.spawnUri -[ $runtime != vm || $compiler != dartk && $compiler != none ] -isolate/package_config_test: SkipByDesign # Uses Isolate.packageConfig -isolate/package_resolve_test: SkipByDesign # Uses Isolate.resolvePackageUri -isolate/package_root_test: SkipByDesign # Uses Isolate.packageRoot -isolate/scenarios/*: SkipByDesign # Use automatic package resolution, spawnFunction and .dart URIs. -isolate/spawn_uri_fail_test: SkipByDesign # Uses dart:io. - [ $hot_reload || $hot_reload_rollback ] convert/chunked_conversion_utf88_test: SkipSlow convert/utf85_test: SkipSlow diff --git a/tests/lib/lib_precompiled.status b/tests/lib/lib_precompiled.status index 5f9922d47dc..8ed3c7d6556 100644 --- a/tests/lib/lib_precompiled.status +++ b/tests/lib/lib_precompiled.status @@ -1,9 +1,3 @@ # Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. - -[ $compiler == none ] -async/future_or_strong_test: RuntimeError -isolate/compile_time_error_test/01: Skip # Issue 12587 -isolate/ping_test: Skip # Resolve test issues -mirrors/symbol_validation_test: RuntimeError # Issue 13596 diff --git a/tests/lib_2/lib_2.status b/tests/lib_2/lib_2.status index 15d4e48108e..bf3222c9ca7 100644 --- a/tests/lib_2/lib_2.status +++ b/tests/lib_2/lib_2.status @@ -73,7 +73,7 @@ html/canvasrendering/pixel_manipulation_test: Skip # Issue 42048 html/request_animation_frame_test: Skip # Times out. Issue 22167 html/transition_event_test: Skip # Times out. Issue 22167 -[ $runtime != dart_precompiled && ($runtime != vm || $compiler != dartk && $compiler != none) ] +[ $runtime != dart_precompiled && ($compiler != dartk || $runtime != vm) ] isolate/vm_rehash_test: SkipByDesign [ $arch == simarm64 || $arch == simarm64c || $arch == simriscv32 || $arch == simriscv64 ] @@ -82,6 +82,13 @@ convert/utf85_test: Skip # Pass, Slow Issue 20111. [ $arch != x64 || $runtime != vm ] isolate/int32_length_overflow_test: SkipSlow +[ $compiler != dartk || $runtime != vm ] +isolate/package_config_test: SkipByDesign # Uses Isolate.packageConfig +isolate/package_resolve_test: SkipByDesign # Uses Isolate.resolvePackageUri +isolate/package_root_test: SkipByDesign # Uses Isolate.packageRoot +isolate/scenarios/*: SkipByDesign # Use automatic package resolution, spawnFunction and .dart URIs. +isolate/spawn_uri_fail_test: SkipByDesign # Uses dart:io. + [ $runtime == chrome || $runtime == ff ] async/slow_consumer2_test: SkipSlow # Times out. Issue 22050 async/stream_timeout_test: SkipSlow # Times out. Issue 22050 @@ -130,13 +137,6 @@ isolate/stacktrace_message_test: Skip # Isolate.spawnUri isolate/static_function_test: Skip # Isolate.spawnUri isolate/unresolved_ports_test: Skip # Isolate.spawnUri -[ $runtime != vm || $compiler != dartk && $compiler != none ] -isolate/package_config_test: SkipByDesign # Uses Isolate.packageConfig -isolate/package_resolve_test: SkipByDesign # Uses Isolate.resolvePackageUri -isolate/package_root_test: SkipByDesign # Uses Isolate.packageRoot -isolate/scenarios/*: SkipByDesign # Use automatic package resolution, spawnFunction and .dart URIs. -isolate/spawn_uri_fail_test: SkipByDesign # Uses dart:io. - [ $hot_reload || $hot_reload_rollback ] convert/chunked_conversion_utf88_test: SkipSlow convert/utf85_test: SkipSlow diff --git a/tests/lib_2/lib_2_precompiled.status b/tests/lib_2/lib_2_precompiled.status index 5f9922d47dc..8ed3c7d6556 100644 --- a/tests/lib_2/lib_2_precompiled.status +++ b/tests/lib_2/lib_2_precompiled.status @@ -1,9 +1,3 @@ # Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. - -[ $compiler == none ] -async/future_or_strong_test: RuntimeError -isolate/compile_time_error_test/01: Skip # Issue 12587 -isolate/ping_test: Skip # Resolve test issues -mirrors/symbol_validation_test: RuntimeError # Issue 13596 diff --git a/tests/standalone/standalone.status b/tests/standalone/standalone.status index 6d0cacd46bb..dfb402c8189 100644 --- a/tests/standalone/standalone.status +++ b/tests/standalone/standalone.status @@ -78,10 +78,10 @@ io/https_nonblocking_trust_evaluation_test: SkipByDesign [ $builder_tag == swarming && $system == macos ] io/*: Skip # Issue 30618 -[ $compiler == none && $runtime == vm && $system == fuchsia ] +[ $compiler == dartk && $runtime == vm && $system == fuchsia ] *: Skip # Not yet triaged. -[ $compiler != none && $runtime != dart_precompiled && $runtime != vm ] +[ $compiler != dartk && $runtime != dart_precompiled && $runtime != vm ] env_test: Skip # This is testing a vm command line parsing scenario. [ $mode == product && $runtime == dart_precompiled ] diff --git a/tests/standalone_2/standalone_2.status b/tests/standalone_2/standalone_2.status index fba85b61dc4..03de539a34a 100644 --- a/tests/standalone_2/standalone_2.status +++ b/tests/standalone_2/standalone_2.status @@ -88,10 +88,10 @@ io/https_nonblocking_trust_evaluation_test: SkipByDesign [ $builder_tag == swarming && $system == macos ] io/*: Skip # Issue 30618 -[ $compiler == none && $runtime == vm && $system == fuchsia ] +[ $compiler == dartk && $runtime == vm && $system == fuchsia ] *: Skip # Not yet triaged. -[ $compiler != none && $runtime != dart_precompiled && $runtime != vm ] +[ $compiler != dartk && $runtime != dart_precompiled && $runtime != vm ] env_test: Skip # This is testing a vm command line parsing scenario. [ $runtime == vm && $system == linux ] diff --git a/tests/web/web.status b/tests/web/web.status index 091f92598e4..cbbfe0fc25d 100644 --- a/tests/web/web.status +++ b/tests/web/web.status @@ -55,7 +55,7 @@ code_motion_exception_test: Skip # Required V8 specific format of JavaScript err [ $compiler == dart2js && ($browser || $host_checked) ] dummy_compiler_test: SkipByDesign # Issue 30773. Test should be migrated as a unit test of dart2js, is only intended to test self-hosting. -[ $compiler == none && $runtime == vm ] +[ $compiler == dartk && $runtime == vm ] new_from_env_test: SkipByDesign # dart2js only test unconditional_dartio_import_test: SkipByDesign # dart2js only test diff --git a/tests/web_2/web_2.status b/tests/web_2/web_2.status index 6d902367fd4..1c7dee62ca4 100644 --- a/tests/web_2/web_2.status +++ b/tests/web_2/web_2.status @@ -51,7 +51,7 @@ code_motion_exception_test: Skip # Required V8 specific format of JavaScript err [ $compiler == dart2js && ($browser || $host_checked) ] dummy_compiler_test: SkipByDesign # Issue 30773. Test should be migrated as a unit test of dart2js, is only intended to test self-hosting. -[ $compiler == none && $runtime == vm ] +[ $compiler == dartk && $runtime == vm ] new_from_env_test: SkipByDesign # dart2js only test unconditional_dartio_import_test: SkipByDesign # dart2js only test diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index 046bc6e65a0..1c85b3663d8 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -417,18 +417,9 @@ "__comment__": "This configuration is only used for a custom test runner. If it conflicts with a new configuration you are adding, you can make this configuration more specific by adding options." }, "vm-ffi-unit-test": { - "__comment__": "This configuration is only used for a custom test runner. If it conflicts with a new configuration you are adding, you can make this configuration more specific by adding options." - }, - "unittest-analyzer_use_fasta-(linux|mac|win)": { + "__comment__": "This configuration is only used for a custom test runner. If it conflicts with a new configuration you are adding, you can make this configuration more specific by adding options.", "options": { - "compiler": "none", - "runtime": "vm", - "mode": "release", - "use-sdk": true, - "vm-options": [ - "-DuseFastaParser=true" - ], - "builder-tag": "analyzer_use_fasta" + "builder-tag": "ffi" } }, "dartk-asan-(linux|mac)-(debug|product|release)-(ia32|x64|simarm|simarm64|simriscv32|simriscv64)": {