Remove runtime 'dart_app' as it became identical to 'vm'.

Merge compiler 'dart2app' and 'dart2appjit' and rename to 'app_jit' since they came to mean the same thing.

Update status files to reflect these changes.

R=asiva@google.com

Review URL: https://codereview.chromium.org/2541533004 .
This commit is contained in:
Ryan Macnak 2016-12-01 16:47:33 -08:00
parent 3126ade6d0
commit 1ebeb79942
18 changed files with 107 additions and 128 deletions

View file

@ -194,7 +194,7 @@ analyzer/test/src/task/strong/inferred_type_test: Crash # Issue 24485
analyzer/test/src/task/strong_mode_test: Crash # Issue 24485
analyzer/test/src/task/yaml_test: Crash # Issue 24485
[ $noopt || $runtime == dart_precompiled || $runtime == dart_app ]
[ $noopt || $runtime == dart_precompiled ]
*: SkipByDesign # The pkg test framework imports dart:mirrors.
[ $compiler == dart2js && $cps_ir && $checked ]

View file

@ -43,7 +43,7 @@ process_service_test: Pass, Fail # Issue 24344
[ $runtime == vm ]
developer_extension_test: Pass, Fail # Issue 27225
[ $runtime == dart_app ]
[ $compiler == app_jit ]
address_mapper_test: CompileTimeError # Issue 27806
capture_stdio_test: CompileTimeError # Issue 27806
complex_reload_test: RuntimeError # Issue 27806

View file

@ -133,6 +133,9 @@ cc/FindCodeObject: SkipSlow # Takes more than 8 minutes. Issue 17440
[ $compiler == dart2analyzer ]
dart/optimized_stacktrace_test: StaticWarning
[ $compiler == app_jit ]
dart/snapshot_version_test: Fail,OK # Expects to find script snapshot relative to Dart source.
[ $runtime != vm ]
dart/snapshot_version_test: SkipByDesign # Spawns processes
dart/spawn_infinite_loop_test: Skip # VM shutdown test
@ -159,7 +162,7 @@ cc/StandaloneSnapshotSize: SkipByDesign # Imports dart:mirrors
dart/inline_stack_frame_test: Pass, RuntimeError
dart/optimized_stacktrace_test: Pass, RuntimeError
[ $runtime == dart_app || $runtime == dart_precompiled ]
[ $compiler == app_jit || $compiler == precompiler ]
dart/data_uri_spawn_test: SkipByDesign # Isolate.spawnUri
dart/optimized_stacktrace_test: SkipByDesign # Requires line numbers

View file

@ -23,5 +23,5 @@ sample_extension/test/*: Skip # Issue 14705
[ $compiler == precompiler ]
sample_extension/test/*: Skip # These tests attempt to spawn another script using the precompiled runtime.
[ $runtime == dart_app ]
[ $compiler == app_jit ]
sample_extension/test/*: Skip # Shared use of a temp directory

View file

@ -2,7 +2,7 @@
# 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.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
*: Skip
[ $compiler == dart2js && $runtime == none ]

View file

@ -68,7 +68,7 @@ LibTest/math/log_A01_t01: PASS, FAIL, OK # Issue 26261
[ $runtime == dartium || $compiler == dart2js ]
LibTest/async/Future/Future.delayed_A01_t02: Pass, Fail # Issue 15524
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && ($runtime == vm || $runtime == drt || $runtime == dart_precompiled || $runtime == dart_app) ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && ($runtime == vm || $runtime == drt || $runtime == dart_precompiled) ]
# Optional trailing commas for argument and parameter lists added to language.
# https://github.com/dart-lang/co19/issues/68
Language/Functions/Formal_Parameters/syntax_t05: Fail, OK

View file

@ -3,7 +3,7 @@
# BSD-style license that can be found in the LICENSE file.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
# Failures ok in tests below. VM moves super initializer to end of list.
Language/Classes/Constructors/Generative_Constructors/execution_t03: Fail, OK
@ -38,7 +38,7 @@ LibTest/isolate/Isolate/spawn_A04_t03: Skip # Flaky, Issue 15974
LibTest/core/Symbol/Symbol_A01_t03: RuntimeError # Issue 13596
LibTest/core/Symbol/Symbol_A01_t05: RuntimeError # Issue 13596
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
LibTest/typed_data/Float32x4/reciprocalSqrt_A01_t01: Pass, Fail # co19 issue 599
LibTest/typed_data/Float32x4/reciprocal_A01_t01: Pass, Fail # co19 issue 599
# With asynchronous loading, the load errors in these tests are no longer recognized as compile errors:
@ -46,13 +46,13 @@ Language/Libraries_and_Scripts/Imports/invalid_uri_t02: Fail
Language/Libraries_and_Scripts/Exports/invalid_uri_t02: Fail
Language/Libraries_and_Scripts/Parts/syntax_t06: Fail
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $mode == debug ]
[ ($runtime == vm || $runtime == dart_precompiled ) && $mode == debug ]
LibTest/core/List/List_class_A01_t02: Pass, Slow
[ ($runtime == dart_precompiled || $runtime == dart_app) && $mode == debug ]
Language/Libraries_and_Scripts/Imports/deferred_import_t02: Crash # Issue 27201
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && ($arch != x64 && $arch != simarm64 && $arch != arm64 && $arch != simdbc64 && $arch != simdbc) ]
[ ($runtime == vm || $runtime == dart_precompiled) && ($arch != x64 && $arch != simarm64 && $arch != arm64 && $arch != simdbc64 && $arch != simdbc) ]
LibTest/core/int/operator_left_shift_A01_t02: Fail # co19 issue 129
[ ($compiler == none || $compiler == precompiler) && ($runtime == vm || $runtime == dart_precompiled) && ($arch == mips || $arch == arm64) ]
@ -62,7 +62,7 @@ LibTest/core/List/List_class_A01_t02: Skip # co19 issue 673
LibTest/collection/ListMixin/ListMixin_class_A01_t02: Skip # co19 issue 673
LibTest/collection/ListBase/ListBase_class_A01_t02: Skip # co19 issue 673
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && ($arch == simarm || $arch == simarmv6 || $arch == simarmv5te || $arch == simmips || $arch == simarm64 || $arch == simdbc || $arch == simdbc64) ]
[ ($runtime == vm || $runtime == dart_precompiled) && ($arch == simarm || $arch == simarmv6 || $arch == simarmv5te || $arch == simmips || $arch == simarm64 || $arch == simdbc || $arch == simdbc64) ]
LibTest/collection/DoubleLinkedQueue/DoubleLinkedQueue_class_A01_t01: Skip # Timeout
LibTest/collection/IterableBase/IterableBase_class_A01_t02: Skip # Timeout
LibTest/collection/IterableMixin/IterableMixin_class_A02_t01: Skip # Timeout
@ -76,16 +76,16 @@ LibTest/core/Uri/Uri_A06_t03: Skip # Timeout
LibTest/collection/ListMixin/ListMixin_class_A01_t02: Pass, Slow
LibTest/collection/ListBase/ListBase_class_A01_t02: Pass, Slow
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
LibTest/isolate/Isolate/spawn_A02_t01: Skip # co19 issue 667
LibTest/html/*: SkipByDesign # dart:html not supported on VM.
LayoutTests/fast/*: SkipByDesign # DOM not supported on VM.
WebPlatformTest/*: SkipByDesign # dart:html not supported on VM.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $mode == debug && $builder_tag == asan ]
[ ($runtime == vm || $runtime == dart_precompiled) && $mode == debug && $builder_tag == asan ]
Language/Types/Interface_Types/subtype_t27: Skip # Issue 21174.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
# co19 update Sep 29, 2015 (3ed795ea02e022ef19c77cf1b6095b7c8f5584d0)
Language/Classes/Getters/type_object_t01: RuntimeError # Issue 23721
Language/Classes/Getters/type_object_t02: RuntimeError # Issue 23721
@ -155,13 +155,13 @@ Language/Expressions/Property_Extraction/Super_Closurization: CompileTimeError #
Language/Metadata/*: SkipByDesign # Uses dart:mirrors
Language/Expressions/Null/instance_of_class_null_t01: Skip # Uses dart:mirrors
[ $noopt || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit || $mode == product ]
[ $noopt || $compiler == precompiler || $compiler == app_jit || $mode == product ]
Language/Libraries_and_Scripts/Imports/deferred_import_t01: Skip # Eager loading
Language/Libraries_and_Scripts/Imports/deferred_import_t02: Skip # Eager loading
Language/Libraries_and_Scripts/Imports/invalid_uri_deferred_t01: Skip # Eager loading
Language/Libraries_and_Scripts/Imports/invalid_uri_deferred_t02: Skip # Eager loading
[ $runtime == dart_precompiled || $runtime == dart_app ]
[ $runtime == dart_precompiled || $compiler == app_jit ]
LibTest/isolate/Isolate/spawnUri*: SkipByDesign # Isolate.spawnUri
[ $noopt || $compiler == precompiler ]
@ -170,7 +170,7 @@ LibTest/collection/ListMixin/ListMixin_class_A01_t02: Pass, Timeout
LibTest/core/Map/Map_class_A01_t04: Pass, Timeout
LibTest/core/Uri/encodeQueryComponent_A01_t02: Pass, Timeout
[ $noopt || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit ]
[ $noopt || $compiler == precompiler || $compiler == app_jit ]
Language/Mixins/Mixin_Application/error_t01: Pass
Language/Mixins/Mixin_Application/error_t02: Pass
Language/Mixins/declaring_constructor_t01: Pass

View file

@ -14,7 +14,7 @@ string_from_environment2_test: Skip
string_from_environment3_test: Skip
string_from_environment_test: Skip
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) ]
[ $compiler == none || $compiler == precompiler || $compiler == app_jit ]
unicode_test: Fail # Bug 6706
compare_to2_test: Fail # Bug 4018
@ -30,7 +30,7 @@ symbol_operator_test/03: Fail # bug 11669
string_case_test/01: Fail # Bug 18061
# #void should be a valid symbol.
[ $compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit || $compiler == dart2js ]
[ $compiler == none || $compiler == precompiler || $compiler == app_jit || $compiler == dart2js ]
symbol_reserved_word_test/02: CompileTimeError # bug 20191
symbol_reserved_word_test/05: CompileTimeError # bug 20191
@ -61,7 +61,7 @@ int_modulo_arith_test/modPow: RuntimeError # No bigints.
[ $compiler == dart2js && $fast_startup ]
apply3_test: Fail # mirrors not supported
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && $runtime != dartium && $runtime != drt ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && $runtime != dartium && $runtime != drt ]
symbol_test/02: MissingCompileTimeError # bug 11669
symbol_test/03: MissingCompileTimeError # bug 11669
@ -156,10 +156,10 @@ stopwatch_test: Skip # Flaky test due to expected performance behaviour.
# The regexp tests are not verified to work on non d8/vm platforms yet.
regexp/*: Skip
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
regexp/global_test: Skip # Timeout. Issue 21709 and 21708
[ $runtime != vm && $runtime != dart_precompiled && $runtime != dart_app && $compiler != dart2analyzer]
[ $runtime != vm && $runtime != dart_precompiled && $compiler != dart2analyzer]
data_resource_test: RuntimeError # Issue 23825 (not implemented yet).
file_resource_test: Skip, OK # VM specific test, uses dart:io.
http_resource_test: Skip, OK # VM specific test, uses dart:io.
@ -170,7 +170,7 @@ package_resource_test: RuntimeError # Issue 26842
[ $mode == debug ]
regexp/pcre_test: Pass, Slow # Timeout. Issue 22008
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $arch == simarmv5te ]
[ ($runtime == vm || $runtime == dart_precompiled) && $arch == simarmv5te ]
int_parse_radix_test/*: Pass, Slow
big_integer_parsed_mul_div_vm_test: Pass, Slow
@ -199,7 +199,7 @@ big_integer_huge_mul_vm_test: Pass, Timeout # --no_intrinsify
big_integer_parsed_mul_div_vm_test: Pass, Timeout # --no_intrinsify
int_parse_radix_test: Pass, Timeout # --no_intrinsify
[ $compiler == precompiler || $runtime == dart_app ]
[ $compiler == precompiler || $compiler == app_jit ]
data_resource_test: Skip # Resolve URI not supported yet in product mode.
package_resource_test: Skip # Resolve URI not supported yet in product mode.
file_resource_test: Skip # Resolve URI not supported yet in product mode.

View file

@ -353,7 +353,7 @@ websql_test/supported: Fail
# 'html' tests import the HTML library, so they only make sense in
# a browser environment.
[ $runtime == vm || $runtime == dart_precompiled || $runtime == dart_app ]
[ $runtime == vm || $runtime == dart_precompiled ]
*: Skip
[ $compiler == dart2js && ($runtime == drt || $runtime == ff) ]

View file

@ -2,17 +2,17 @@
# 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.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
browser/*: SkipByDesign # Browser specific tests
isolate_stress_test: Skip # Issue 12588: Uses dart:html. This should be able to pass when we have wrapper-less tests.
[ $runtime != vm || $mode == product ]
[ $runtime != vm || $mode == product || $compiler == app_jit ]
checked_test: Skip # Unsupported.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $arch == mips && $mode == debug ]
[ ($runtime == vm || $runtime == dart_precompiled) && $arch == mips && $mode == debug ]
mandel_isolate_test: Skip # Uses 600 MB Ram on our 1 GB test device.
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) ]
[ $compiler == none || $compiler == precompiler || $compiler == app_jit ]
compile_time_error_test/01: Skip # Issue 12587
ping_test: Skip # Resolve test issues
ping_pause_test: Skip # Resolve test issues
@ -191,7 +191,7 @@ stacktrace_message_test: SkipByDesign
static_function_test: SkipByDesign
unresolved_ports_test: SkipByDesign
[ $runtime == dart_precompiled || $runtime == dart_app ]
[ $runtime == dart_precompiled || $compiler == app_jit ]
count_test: Skip # Isolate.spawnUri
cross_isolate_message_test: Skip # Isolate.spawnUri
deferred_in_isolate2_test: Skip # Isolate.spawnUri

View file

@ -5,7 +5,7 @@
# This directory contains tests that are intended to show the
# current state of the language.
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) ]
[ $compiler == none || $compiler == precompiler || $compiler == app_jit ]
tearoff_constructor_basic_test: Skip # Crashes in checked mode -- hausner investigating
generic_methods_type_expression_test: RuntimeError # Issue 25869
@ -51,7 +51,7 @@ async_star_cancel_while_paused_test: RuntimeError
# Fails because `as T` is an error rather than being treated like `as dynamic`.
generic_methods_type_expression_test: RuntimeError # Issue 27460
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && $checked ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && $checked ]
# These generic functions tests pass for the wrong reason in checked mode,
# because the parsed type parameters are mapped to dynamic type.
generic_methods_function_type_test: Pass # Issue 25869
@ -61,17 +61,17 @@ generic_local_functions_test: Pass # Issue 25869
generic_functions_test: Pass # Issue 25869
generic_methods_generic_function_parameter_test: Pass # Issue 25869
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && ($runtime == vm || $runtime == dart_precompiled) ]
class_keyword_test/02: MissingCompileTimeError # Issue 13627
unicode_bom_test: Fail # Issue 16067
vm/debug_break_enabled_vm_test/01: Crash, OK # Expected to hit breakpoint.
try_catch_optimized1_test: Skip # Srdjan investigating
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && $checked ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && $checked ]
type_variable_bounds4_test/01: Fail # Issue 14006
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && (($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) || $runtime == drt || $runtime == dartium) ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && (($runtime == vm || $runtime == dart_precompiled) || $runtime == drt || $runtime == dartium) ]
dynamic_prefix_core_test/none: Fail # Issue 12478
export_ambiguous_main_negative_test: Fail # Issue 14763
@ -130,16 +130,16 @@ async_await_test: Skip # Issue 26198
[ $compiler == none && $runtime == drt ]
disassemble_test: Pass, Fail # Issue 18122
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $arch == mips && $mode == debug ]
[ ($runtime == vm || $runtime == dart_precompiled) && $arch == mips && $mode == debug ]
large_class_declaration_test: SkipSlow # Times out. Issue 20352
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $arch == arm64 ]
[ ($runtime == vm || $runtime == dart_precompiled) && $arch == arm64 ]
large_class_declaration_test: SkipSlow # Uses too much memory.
[ $compiler == none && ($runtime == dartium || $runtime == drt) && $mode == debug ]
large_class_declaration_test: SkipSlow # Times out. Issue 20352
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && ( $arch == simarm || $arch == arm || $arch == simarmv6 || $arch == armv6 || $arch == simarmv5te || $arch == armv5te || $arch == simarm64 || $arch == arm64 || $arch == simmips || $arch == mips) ]
[ ($runtime == vm || $runtime == dart_precompiled) && ( $arch == simarm || $arch == arm || $arch == simarmv6 || $arch == armv6 || $arch == simarmv5te || $arch == armv5te || $arch == simarm64 || $arch == arm64 || $arch == simmips || $arch == mips) ]
vm/load_to_load_unaligned_forwarding_vm_test: Pass, Crash # Unaligned offset. Issue 22151
vm/unaligned_float_access_literal_index_test: Pass, Crash # Unaligned offset. Issue 22151
vm/unaligned_float_access_literal_index_test: Pass, Crash # Unaligned offset. Issue 22151
@ -148,7 +148,7 @@ vm/unaligned_float_access_literal_index_test: Pass, Crash # Unaligned offset. Is
[ $compiler == none && ($runtime == dartium || $runtime == drt) ]
issue23244_test: Fail # Issue 23244
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && (($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) || $runtime == drt || $runtime == dartium) && $arch == ia32 ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && (($runtime == vm || $runtime == dart_precompiled) || $runtime == drt || $runtime == dartium) && $arch == ia32 ]
vm/regress_24517_test: Pass, Fail # Issue 24517.
[ $compiler == precompiler && $runtime == dart_precompiled ]
@ -201,7 +201,7 @@ regress_22443_test: Fail
deferred_not_loaded_check_test: Fail
vm/regress_27201_test: Fail
[ $mode == product || $compiler == dart2appjit || $compiler == dart2app || $compiler == precompiler ]
[ $mode == product || $compiler == app_jit || $compiler == precompiler ]
# Deferred loading happens eagerly. Issue #27587
regress_23408_test: Fail
deferred_inheritance_constraints_test/redirecting_constructor: Fail
@ -217,7 +217,7 @@ vm/regress_27201_test: Fail
deferred_global_test: Fail
vm/regress_27201_test: Fail
[ $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit ]
[ $compiler == precompiler || $compiler == app_jit ]
ct_const2_test: Skip # Incompatible flag: --compile_all
hello_dart_test: Skip # Incompatible flag: --compile_all
@ -225,7 +225,7 @@ hello_dart_test: Skip # Incompatible flag: --compile_all
implicit_closure_test: Skip # Incompatible flag: --use_slow_path
deopt_inlined_function_lazy_test: Skip # Incompatible flag: --deoptimize-alot
[ $noopt || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit ]
[ $noopt || $compiler == precompiler || $compiler == app_jit ]
vm/type_vm_test: RuntimeError # Expects line and column numbers
vm/type_cast_vm_test: RuntimeError # Expects line and column numbers
@ -245,17 +245,17 @@ map_literal4_test: SkipByDesign # Requires checked mode.
vm/type_vm_test: Fail,OK # Expects exact type name.
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && $browser ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && $browser ]
# The following tests are supposed to fail.
library_env_test/has_io_support: RuntimeError, OK
library_env_test/has_no_html_support: RuntimeError, OK
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && $browser != true ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && $browser != true ]
# The following tests are supposed to fail.
library_env_test/has_html_support: RuntimeError, OK
library_env_test/has_no_io_support: RuntimeError, OK
[ ($compiler == none || $compiler == dart2app || $compiler == dart2appjit) && $noopt == false && $mode != product ]
[ ($compiler == none || $compiler == app_jit) && $noopt == false && $mode != product ]
# The following tests are supposed to fail.
library_env_test/has_no_mirror_support: RuntimeError, OK

View file

@ -209,14 +209,11 @@ async/timer_not_available_test: Fail, OK # only meant to test when there is no w
# 'js' tests import the dart:js library, so they only make sense in
# a browser environment.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
js/*: Skip
# 'js' tests import the dart:js library, so they only make sense in
# a browser environment.
[ $runtime == dart_app ]
js/*: SkipByDesign
mirrors/*: SkipByDesign
[ $compiler == app_jit ]
mirrors/*: Skip # Issue 27929: Triage
[ $compiler == dart2js && $minified ]
mirrors/mirrors_used_get_name_test: RuntimeError
@ -255,13 +252,13 @@ async/timer_test: Fail, Pass
[ $runtime == vm ]
convert/streamed_conversion_json_utf8_decode_test: Pass, Slow # Infrequent timeouts.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
async/timer_not_available_test: Fail, OK
mirrors/native_class_test: Fail, OK # This test is meant to run in a browser.
mirrors/deferred_type_test: CompileTimeError, OK # Don't have a multitest marker for dynamic compile time errors.
mirrors/initializing_formals_test/01: Fail # initializing formals are implicitly final as of Dart 1.21
[ $compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit ]
[ $compiler == none || $compiler == precompiler || $compiler == app_jit ]
async/timer_not_available_test: SkipByDesign # only meant to test when there is no way to implement timer (currently only in d8)
mirrors/symbol_validation_test: RuntimeError # Issue 13596
@ -331,7 +328,7 @@ mirrors/*deferred*: Pass,RuntimeError # Issue 17458
[ $compiler == dart2js && $mode == debug ]
mirrors/native_class_test: Pass, Slow
[ ($compiler == none || $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit) && $arch == mips ]
[ ($compiler == none || $compiler == precompiler || $compiler == app_jit) && $arch == mips ]
async/timer_regress22626_test: Pass, RuntimeError # Issue 22626
[ $arch == simarm || $arch == simarmv6 || $arch == simarmv5te ]
@ -354,13 +351,13 @@ convert/utf85_test: Skip # Pass, Slow Issue 20111.
[ $mode == debug && $arch == ia32 && $system == windows ]
convert/streamed_conversion_json_utf8_decode_test: Skip # Verification OOM.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $mode == debug && $arch == x64 && $system == windows ]
[ ($runtime == vm || $runtime == dart_precompiled) && $mode == debug && $arch == x64 && $system == windows ]
convert/streamed_conversion_json_utf8_decode_test: Pass, Slow
[ $mode == debug && $arch != ia32 && $arch != x64 && $arch != simarm && $arch != simarmv6 && $arch != simarmv5te ]
convert/streamed_conversion_json_utf8_decode_test: Skip # Verification not yet implemented.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $mode == debug && $builder_tag == asan ]
[ ($runtime == vm || $runtime == dart_precompiled) && $mode == debug && $builder_tag == asan ]
mirrors/immutable_collections_test: SkipSlow # Timeout.
convert/streamed_conversion_json_utf8_decode_test: Skip # Timeout.

View file

@ -19,16 +19,16 @@ package/scenarios/invalid/same_package_twice_test.dart: RuntimeError, CompileTim
issue14236_test: Pass # Do not remove this line. It serves as a marker for Issue 14516 comment #4.
[ ($runtime != vm && $runtime != dart_precompiled && $runtime != dart_app) && ($runtime != drt || $compiler != none)) ]
[ ($runtime != vm && $runtime != dart_precompiled) && ($runtime != drt || $compiler != none)) ]
no_assert_test: Fail, OK # This is testing a vm flag.
env_test: Skip # This is testing a vm command line parsing scenario.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
package/package_isolate_test: Fail # Issue 12474
io/observatory_test: Fail
package/scenarios/invalid/same_package_twice_test: Pass # Issue 24119
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $checked ]
[ ($runtime == vm || $runtime == dart_precompiled) && $checked ]
# These tests have type errors on purpose.
io/process_invalid_arguments_test: Fail, OK
io/directory_invalid_arguments_test: Fail, OK
@ -41,7 +41,7 @@ io/stdout_bad_argument_test: Fail, OK
io/file_fuzz_test: Skip
io/directory_fuzz_test: Skip
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $system == macos ]
[ ($runtime == vm || $runtime == dart_precompiled) && $system == macos ]
# This test fails with "Too many open files" on the Mac OS buildbot.
# This is expected as MacOS by default runs with a very low number
# of allowed open files ('ulimit -n' says something like 256).
@ -114,7 +114,7 @@ deferred_transitive_import_error_test: Skip # Contains intentional errors.
[ $compiler == dart2js && $cps_ir && $checked ]
*: Skip # `assert` not implemented
[ ($runtime == vm || $runtime == dart_app) && ($arch == arm || $arch == arm64) ]
[ $runtime == vm && ($arch == arm || $arch == arm64) ]
io/file_stream_test: Skip # Issue 26109
io/file_typed_data_test: Skip # Issue 26109
io/file_input_stream_test: Skip # Issue 26109
@ -197,12 +197,12 @@ io/process_sync_test: Pass, Timeout # Issue 24596
io/sleep_test: Pass, Fail # Issue 25757
io/socket_info_ipv6_test: RuntimeError # Issue 27876
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) && $mode == debug && $builder_tag == asan ]
[ ($runtime == vm || $runtime == dart_precompiled) && $mode == debug && $builder_tag == asan ]
io/file_lock_test: Skip # Timeout.
io/test_runner_test: Skip # Timeout.
io/http_client_stays_alive_test: Skip # Timeout.
[ ($runtime == vm || $runtime == dart_precompiled || $runtime == dart_app) ]
[ $runtime == vm || $runtime == dart_precompiled ]
# Failures in secure networking while NSS is replaced with BoringSSL
io/https_client_certificate_test: RuntimeError # Issue 24070
io/secure_socket_renegotiate_test: RuntimeError
@ -220,10 +220,10 @@ assert_test: Pass, RuntimeError
map_insert_remove_oom_test: Skip # Heap limit too low. Increasing iteration count to make a higher limit a meaningful test makes it too slow for simarm[64] bots.
io/web_socket_test: Pass, RuntimeError # Issue 24674
[ $compiler == precompiler || $compiler == dart2app || $compiler == dart2appjit ]
[ $compiler == precompiler || $compiler == app_jit ]
io/compile_all_test: Skip # Incompatible flag --compile_all
[ $runtime == dart_app ]
[ $compiler == app_jit ]
io/stdout_bad_argument_test: Skip # Test exits and so can't generate snapshot.
io/directory_list_sync_test: Skip # Snapshot path differs from script path.
io/test_extension_test: Skip # Snapshot path differs from script path.
@ -276,7 +276,10 @@ io/skipping_dart2js_compilations_test: CompileTimeError # Imports dart:mirrors
io/test_harness_analyzer_test: CompileTimeError # Imports dart:mirrors
io/test_runner_test: CompileTimeError # Imports dart:mirrors
[ $runtime == dart_precompiled || $runtime == dart_app || $mode == product ]
[ $compiler == app_jit ]
assert_test: RuntimeError # Script name change?
[ $runtime == dart_precompiled || $mode == product ]
assert_test: SkipByDesign # Requires checked mode.
no_assert_test: SkipByDesign # Requires checked mode.
io/code_collection_test: Skip # Incompatible flags
@ -293,7 +296,7 @@ no_support_timeline_test: SkipByDesign
io/stdio_implicit_close_test: Skip # SkipByDesign
# Following tests are skipped on dart_app as package mapping is not supported.
[ $runtime == dart_precompiled || $runtime == dart_app ]
[ $runtime == dart_precompiled || $compiler == app_jit ]
package/scenarios/packages_file_strange_formatting/mixed_line_ends_test: Skip
package/scenarios/packages_file_strange_formatting/empty_lines_test: Skip
package/scenarios/invalid/invalid_utf8_test: Skip
@ -342,7 +345,7 @@ io/raw_secure_socket_test: RuntimeError
io/https_bad_certificate_test: RuntimeError
io/secure_server_closing_test: RuntimeError
[ $runtime == vm || $runtime == dart_app || $runtime == dart_precompiled ]
[ $runtime == vm || $runtime == dart_precompiled ]
deferred_transitive_import_error_test: Skip # Contains intentional errors.
[ $hot_reload || $hot_reload_rollback ]

View file

@ -79,10 +79,9 @@ abstract class CompilerConfiguration {
useFastStartup: useFastStartup,
extraDart2jsOptions:
TestUtils.getExtraOptions(configuration, 'dart2js_options'));
case 'dart2appjit':
case 'dart2app':
case 'app_jit':
return new Dart2AppSnapshotCompilerConfiguration(
isDebug: isDebug, isChecked: isChecked, useBlobs: useBlobs);
isDebug: isDebug, isChecked: isChecked);
case 'precompiler':
return new PrecompilerCompilerConfiguration(
isDebug: isDebug,
@ -701,9 +700,8 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
}
class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
final bool useBlobs;
Dart2AppSnapshotCompilerConfiguration({bool isDebug, bool isChecked, bool useBlobs})
: super._subclass(isDebug: isDebug, isChecked: isChecked), this.useBlobs = useBlobs;
Dart2AppSnapshotCompilerConfiguration({bool isDebug, bool isChecked})
: super._subclass(isDebug: isDebug, isChecked: isChecked);
int computeTimeoutMultiplier() {
int multiplier = 2;
@ -718,10 +716,11 @@ class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
CommandBuilder commandBuilder,
List arguments,
Map<String, String> environmentOverrides) {
var snapshot = "$tempDir/out.jitsnapshot";
return new CommandArtifact(<Command>[
this.computeCompilationCommand(tempDir, buildDir,
CommandBuilder.instance, arguments, environmentOverrides)
], tempDir, 'application/dart-snapshot');
], snapshot, 'application/dart-snapshot');
}
CompilationCommand computeCompilationCommand(
@ -732,15 +731,13 @@ class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
Map<String, String> environmentOverrides) {
var exec = "$buildDir/dart";
var args = new List();
args.add("--snapshot=$tempDir/out.jitsnapshot");
var snapshot = "$tempDir/out.jitsnapshot";
args.add("--snapshot=$snapshot");
args.add("--snapshot-kind=app-jit");
if (useBlobs) {
args.add("--use-blobs");
}
args.addAll(arguments);
return commandBuilder.getCompilationCommand(
'dart2snapshot',
'app_jit',
tempDir,
!useSdk,
bootstrapDependencies(buildDir),
@ -775,10 +772,16 @@ class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
args.add('--enable_asserts');
args.add('--enable_type_checks');
}
return args
args
..addAll(vmOptions)
..addAll(sharedOptions)
..addAll(originalArguments);
for (var i = 0; i < args.length; i++) {
if (args[i].endsWith(".dart")) {
args[i] = artifact.filename;
}
}
return args;
}
}

View file

@ -218,7 +218,9 @@ class StandaloneDartRuntimeConfiguration extends DartVmRuntimeConfiguration {
Map<String, String> environmentOverrides) {
String script = artifact.filename;
String type = artifact.mimeType;
if (script != null && type != 'application/dart') {
if (script != null &&
type != 'application/dart' &&
type != 'application/dart-snapshot') {
throw "Dart VM cannot run files of type '$type'.";
}
String executable = suite.configuration['noopt']
@ -230,37 +232,6 @@ class StandaloneDartRuntimeConfiguration extends DartVmRuntimeConfiguration {
}
}
class DartAppRuntimeConfiguration extends DartVmRuntimeConfiguration {
final bool useBlobs;
DartAppRuntimeConfiguration({bool useBlobs}) : useBlobs = useBlobs;
List<Command> computeRuntimeCommands(
TestSuite suite,
CommandBuilder commandBuilder,
CommandArtifact artifact,
List<String> arguments,
Map<String, String> environmentOverrides) {
String script = artifact.filename;
String type = artifact.mimeType;
if (script != null && type != 'application/dart-snapshot') {
throw "dart_app cannot run files of type '$type'.";
}
var args = new List();
args.addAll(arguments);
for (var i = 0; i < args.length; i++) {
if (args[i].endsWith(".dart")) {
args[i] = "${artifact.filename}/out.jitsnapshot";
}
}
return <Command>[
commandBuilder.getVmCommand(suite.dartVmBinaryFileName,
args, environmentOverrides)
];
}
}
class DartPrecompiledRuntimeConfiguration extends DartVmRuntimeConfiguration {
final bool useBlobs;
DartPrecompiledRuntimeConfiguration({bool useBlobs}) : useBlobs = useBlobs;

View file

@ -88,8 +88,9 @@ class TestOptionsParser {
'precompiler',
'dart2js',
'dart2analyzer',
'dart2app',
'dart2appjit',
'app_jit',
'dart2app', // TODO(rmacnak): Remove after updating bots.
'dart2appjit', // TODO(rmacnak): Remove after updating bots.
'dartk',
'dartkp'
],
@ -103,8 +104,6 @@ class TestOptionsParser {
dart_precompiled: Run a precompiled snapshot on a variant of the standalone
dart vm lacking a JIT.
dart_app: Run a full app snapshot, with or without cached unoptimized code.
d8: Run JavaScript from the command line using v8.
jsshell: Run JavaScript from the command line using firefox js-shell.
@ -128,7 +127,7 @@ class TestOptionsParser {
[
'vm',
'dart_precompiled',
'dart_app',
'dart_app', // TODO(rmacnak): Remove after updating bots.
'd8',
'jsshell',
'drt',
@ -696,16 +695,11 @@ Note: currently only implemented for dart2js.''',
case 'dart2analyzer':
validRuntimes = const ['none'];
break;
case 'dart2app':
case 'dart2appjit':
validRuntimes = const ['dart_app'];
break;
case 'precompiler':
validRuntimes = const ['dart_precompiled'];
break;
case 'app_jit':
case 'dartk':
validRuntimes = const ['vm'];
break;
case 'precompiler':
case 'dartkp':
validRuntimes = const ['dart_precompiled'];
break;
@ -750,6 +744,15 @@ Note: currently only implemented for dart2js.''',
* into a list of configurations with exactly one value per key.
*/
List<Map> _expandConfigurations(Map configuration) {
// TODO(rmacnak): Remove after updating bots.
if (configuration['runtime'] == 'dart_app') {
configuration['runtime'] = 'vm';
}
if (configuration['compiler'] == 'dart2app' ||
configuration['compiler'] == 'dart2appjit') {
configuration['compiler'] = 'app_jit';
}
// Expand the pseudo-values such as 'all'.
if (configuration['arch'] == 'all') {
configuration['arch'] = 'ia32,x64,simarm,simarm64,simmips,simdbc64';

View file

@ -1768,7 +1768,7 @@ CommandOutput createCommandOutput(Command command, int exitCode, bool timedOut,
command, exitCode, timedOut, stdout, stderr, time, pid);
} else if (command is CompilationCommand) {
if (command.displayName == 'precompiler' ||
command.displayName == 'dart2snapshot') {
command.displayName == 'app_jit') {
return new VmCommandOutputImpl(
command, exitCode, timedOut, stdout, stderr, time, pid);
}

View file

@ -1831,11 +1831,10 @@ class StandardTestSuite extends TestSuite {
}
List<List<String>> getVmOptions(Map optionsFromFile) {
var COMPILERS = const ['none', 'precompiler', 'dart2app', 'dart2appjit'];
var COMPILERS = const ['none', 'precompiler', 'app_jit'];
var RUNTIMES = const [
'none',
'dart_precompiled',
'dart_app',
'vm',
'drt',
'dartium',