From 9939ff116ca26b2c0a4dacc184b0166332265ccb Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Mon, 8 Aug 2022 17:23:50 +0000 Subject: [PATCH] [ddc] Ensure status file entries are consistent Compilers named "dartdevc" and "dartdevk" should be listed together at all locations. These are now aliases for the same compiler across different configurations. In the future these names should converge on "dartdevc". Some skipped tests for "dartdevc" no longer need to be skipped but currently there are no configurations are running those tests with that compiler name so removing the skips shows no change in test results. Change-Id: Ieca27fbe497c4768293de125b14c694666dc8a8b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/253821 Reviewed-by: Alexander Thomas Commit-Queue: Nicholas Shahan --- tests/corelib/corelib.status | 4 +--- tests/dartdevc_2/dartdevc_native_dartdevc.status | 4 ---- tests/language/language.status | 2 +- tests/language/language_dartdevc.status | 8 -------- tests/language_2/language_2.status | 2 +- tests/language_2/language_2_dartdevc.status | 12 ------------ tests/lib/lib.status | 2 +- tests/lib/lib_dartdevc.status | 3 --- tests/lib_2/lib_2.status | 2 +- tests/lib_2/lib_2_dartdevc.status | 3 --- 10 files changed, 5 insertions(+), 37 deletions(-) diff --git a/tests/corelib/corelib.status b/tests/corelib/corelib.status index 20ff4d8447b..dbc80b99788 100644 --- a/tests/corelib/corelib.status +++ b/tests/corelib/corelib.status @@ -5,9 +5,6 @@ bigint_parse_radix_test/3: Slow # Issue http://dartbug.com/47050 bigint_test: Pass, Slow -[ $compiler == dartdevk ] -regexp/lookbehind_test/01: Skip # Flaky in uncatchable way. Issue 36280 - [ $compiler == dartkp ] bigint_parse_radix_test: Slow, Pass # --no_intrinsify bigint_test/03: SkipSlow # --no_intrinsify @@ -58,6 +55,7 @@ bigint_test: Skip # Issue 31659 bigint_test/03: SkipSlow # modPow is very slow bigint_test/15: SkipSlow # modPow is very slow list_concurrent_modify_self_test: SkipSlow # missing check causes list to grow to whole heap +regexp/lookbehind_test/01: Skip # Flaky in uncatchable way. Issue 36280 uri_parse_test: Slow, Pass uri_test: Slow, Pass diff --git a/tests/dartdevc_2/dartdevc_native_dartdevc.status b/tests/dartdevc_2/dartdevc_native_dartdevc.status index 0cfabdd025e..228eaee8838 100644 --- a/tests/dartdevc_2/dartdevc_native_dartdevc.status +++ b/tests/dartdevc_2/dartdevc_native_dartdevc.status @@ -3,7 +3,3 @@ # BSD-style license that can be found in the LICENSE file. # Sections in this file should contain "$compiler == dartdevc" or dartdevk. - -[ $compiler == dartdevc ] -variance_subtype_test: SkipByDesign # Not supported by analyzer based DDC. -variance_test: SkipByDesign # Not supported by analyzer based DDC. diff --git a/tests/language/language.status b/tests/language/language.status index f0b144bfd8b..4fb55210460 100644 --- a/tests/language/language.status +++ b/tests/language/language.status @@ -43,7 +43,7 @@ unsorted/disassemble_test: Skip # VM only test [ $compiler != dart2analyzer && $compiler != fasta ] identifier/built_in_type_annotation_test/*: SkipByDesign # Analyzer/CFE only tests. -[ $compiler != dart2js && $compiler != dartdevc && !$checked ] +[ $compiler != dart2js && !$checked ] function_type/*: Skip # Needs checked mode. [ $compiler != dartk && $compiler != dartkp && $mode == debug && $runtime == vm ] diff --git a/tests/language/language_dartdevc.status b/tests/language/language_dartdevc.status index 5ab9a1e47b5..df7e9f02a66 100644 --- a/tests/language/language_dartdevc.status +++ b/tests/language/language_dartdevc.status @@ -3,14 +3,6 @@ # BSD-style license that can be found in the LICENSE file. # Sections in this file should contain "$compiler == dartdevc" or dartdevk. -[ $compiler == dartdevc ] -class/large_class_declaration_test: Slow, Pass -extension_methods/*: SkipByDesign # Analyzer DDC is expected to be turned down before releasing extension methods. -nnbd/*: Skip -variance/*: SkipByDesign # Analyzer DDC is expected to be turned down before releasing variance. - -[ $compiler == dartdevk && !$checked ] -assert/initializer_const_error2_test/*: SkipByDesign # DDC does not support non-checked mode. [ $compiler == dartdevc || $compiler == dartdevk ] async_star/throw_in_catch_test: Skip # Times out. Issue 29920 diff --git a/tests/language_2/language_2.status b/tests/language_2/language_2.status index ad85c7eaaa3..73197d5e948 100644 --- a/tests/language_2/language_2.status +++ b/tests/language_2/language_2.status @@ -37,7 +37,7 @@ unsorted/disassemble_test: Skip # VM only test [ $compiler != dart2analyzer && $compiler != fasta ] identifier/built_in_type_annotation_test/*: SkipByDesign # Analyzer/CFE only tests. -[ $compiler != dart2js && $compiler != dartdevc && !$checked ] +[ $compiler != dart2js && !$checked ] function_type/*: Skip # Needs checked mode. [ $compiler != dartk && $compiler != dartkp && $mode == debug && $runtime == vm ] diff --git a/tests/language_2/language_2_dartdevc.status b/tests/language_2/language_2_dartdevc.status index dbb1e797e45..99560f3a42d 100644 --- a/tests/language_2/language_2_dartdevc.status +++ b/tests/language_2/language_2_dartdevc.status @@ -3,18 +3,6 @@ # BSD-style license that can be found in the LICENSE file. # Sections in this file should contain "$compiler == dartdevc" or dartdevk. -[ $compiler == dartdevc ] -class/large_class_declaration_test: Slow, Pass -const/double_in_int_op_test/dd6: Skip # Triple shift -const/double_in_int_op_test/di6: Skip # Triple shift -const/double_in_int_op_test/id6: Skip # Triple shift -const/double_in_int_op_test/ii6: Skip # Triple shift -extension_methods/*: SkipByDesign # Analyzer DDC is expected to be turned down before releasing extension methods. -nnbd/*: Skip -variance/*: SkipByDesign # Analyzer DDC is expected to be turned down before releasing variance. - -[ $compiler == dartdevk && !$checked ] -assert/initializer_const_error2_test/*: SkipByDesign # DDC does not support non-checked mode. [ ($compiler == dartdevc || $compiler == dartdevk) && ($runtime == ff || $runtime == firefox) ] async/return_throw_test: Skip # Flaky but not enough to be detected. Re-enable pending a decision on the correct behavior. https://github.com/dart-lang/sdk/issues/44395 diff --git a/tests/lib/lib.status b/tests/lib/lib.status index c63ea179ec7..c68cbad9d0b 100644 --- a/tests/lib/lib.status +++ b/tests/lib/lib.status @@ -59,7 +59,7 @@ js/mock_test/*: SkipByDesign # Issue 42085. js/parameters_test: SkipByDesign # Issue 42085. js/trust_types_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code -[ $compiler != dart2js && $compiler != dartdevk ] +[ $compiler != dart2js && $compiler != dartdevc && $compiler != dartdevk ] web/*: SkipByDesign [ $runtime == chrome && $system == macos ] diff --git a/tests/lib/lib_dartdevc.status b/tests/lib/lib_dartdevc.status index 1fb6c510df5..57ab98c28a1 100644 --- a/tests/lib/lib_dartdevc.status +++ b/tests/lib/lib_dartdevc.status @@ -2,9 +2,6 @@ # 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 == dartdevc ] -html/xhr_test: Slow, Pass - [ $runtime == chrome && ($compiler == dartdevc || $compiler == dartdevk) ] html/js_dispatch_property_test: Skip # Timeout Issue 31030 diff --git a/tests/lib_2/lib_2.status b/tests/lib_2/lib_2.status index 25b0e588d09..1688cf9d951 100644 --- a/tests/lib_2/lib_2.status +++ b/tests/lib_2/lib_2.status @@ -59,7 +59,7 @@ js/mock_test/*: SkipByDesign # Issue 42085. js/parameters_test: SkipByDesign # Issue 42085. js/trust_types_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code -[ $compiler != dart2js && $compiler != dartdevk ] +[ $compiler != dart2js && $compiler != dartdevc && $compiler != dartdevk ] web/*: SkipByDesign [ $runtime == chrome && $system == macos ] diff --git a/tests/lib_2/lib_2_dartdevc.status b/tests/lib_2/lib_2_dartdevc.status index 1b058f5d6b8..e672a91b79b 100644 --- a/tests/lib_2/lib_2_dartdevc.status +++ b/tests/lib_2/lib_2_dartdevc.status @@ -2,9 +2,6 @@ # 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 == dartdevc ] -html/xhr_test: Slow, Pass - [ $runtime == chrome && ($compiler == dartdevc || $compiler == dartdevk) ] html/js_dispatch_property_test: Skip # Timeout Issue 31030