Skip to content

Commit de44a23

Browse files
nshahanCommit Queue
nshahan
authored and
Commit Queue
committed
[test_runner] Cleanup unused compiler names
"dartdevc" and "dartdevk" have been replaced with "ddc". Change-Id: I823bc029a0bbe1295fd731efcc32961e61c6c175 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/282485 Commit-Queue: Nicholas Shahan <[email protected]> Reviewed-by: Alexander Thomas <[email protected]>
1 parent 3b50e0a commit de44a23

26 files changed

+93
-117
lines changed

‎pkg/dev_compiler/lib/ddc.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
/// Command line entry point for Dart Development Compiler (dartdevc), used to
6-
/// compile a collection of dart libraries into a single JS module
5+
/// Command line entry point for Dart Development Compiler (known as ddc,
6+
/// dartdevc, dev compiler), used to compile a collection of dart libraries into
7+
/// a single JS module.
78
89
import 'dart:async';
910
import 'dart:convert';
@@ -90,7 +91,7 @@ class _BatchHelper {
9091
/// on the terminal (I think `set DDC_LEAK_TEST="true"` on Windows).
9192
/// Then one could run test.py, say
9293
/// ```
93-
/// python3 tools/test.py -t10000 -c dartdevk --nnbd weak -m release -r none \
94+
/// python3 tools/test.py -t10000 -c ddc --nnbd weak -m release -r none \
9495
/// --enable-asserts --no-use-sdk -j 1 co19/LanguageFeatures/
9596
/// ```
9697
/// and attach the leak tester via

‎pkg/expect/lib/config.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ bool get isDart2jsConfiguration => _configuration.compiler == Compiler.dart2js;
2424
bool get isDart2WasmConfiguration =>
2525
_configuration.compiler == Compiler.dart2wasm;
2626

27-
bool get isDdcConfiguration =>
28-
_configuration.compiler == Compiler.dartdevk ||
29-
_configuration.compiler == Compiler.dartdevc ||
30-
_configuration.compiler == Compiler.ddc;
27+
bool get isDdcConfiguration => _configuration.compiler == Compiler.ddc;
3128

3229
bool get isVmJitConfiguration => _configuration.compiler == Compiler.dartk;
3330

‎pkg/smith/lib/configuration.dart

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,6 @@ class Compiler extends NamedEnum {
764764
static const dart2js = Compiler._('dart2js');
765765
static const dart2analyzer = Compiler._('dart2analyzer');
766766
static const dart2wasm = Compiler._('dart2wasm');
767-
static const dartdevc = Compiler._('dartdevc');
768-
static const dartdevk = Compiler._('dartdevk');
769767
static const ddc = Compiler._('ddc');
770768
static const appJitk = Compiler._('app_jitk');
771769
static const dartk = Compiler._('dartk');
@@ -779,8 +777,6 @@ class Compiler extends NamedEnum {
779777
dart2js,
780778
dart2analyzer,
781779
dart2wasm,
782-
dartdevc,
783-
dartdevk,
784780
ddc,
785781
appJitk,
786782
dartk,
@@ -820,8 +816,6 @@ class Compiler extends NamedEnum {
820816
Runtime.chromeOnAndroid,
821817
];
822818

823-
case Compiler.dartdevc:
824-
case Compiler.dartdevk:
825819
case Compiler.ddc:
826820
return const [
827821
Runtime.none,
@@ -862,8 +856,6 @@ class Compiler extends NamedEnum {
862856
return Runtime.d8;
863857
case Compiler.dart2wasm:
864858
return Runtime.d8;
865-
case Compiler.dartdevc:
866-
case Compiler.dartdevk:
867859
case Compiler.ddc:
868860
return Runtime.chrome;
869861
case Compiler.dart2analyzer:
@@ -886,8 +878,6 @@ class Compiler extends NamedEnum {
886878
case Compiler.dart2analyzer:
887879
case Compiler.dart2js:
888880
case Compiler.dart2wasm:
889-
case Compiler.dartdevc:
890-
case Compiler.dartdevk:
891881
case Compiler.ddc:
892882
case Compiler.fasta:
893883
return Mode.release;

‎pkg/smith/test/configuration_test.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,11 @@ void main() {
183183
});
184184

185185
test("runtime defaults to compiler's default runtime", () {
186-
expect(Configuration.parse("dartdevc", {}).runtime,
187-
equals(Runtime.chrome));
186+
expect(Configuration.parse("ddc", {}).runtime, equals(Runtime.chrome));
188187
});
189188

190189
test("runtime defaults to compiler's default runtime from option", () {
191-
expect(Configuration.parse("wat", {"compiler": "dartdevc"}).runtime,
190+
expect(Configuration.parse("wat", {"compiler": "ddc"}).runtime,
192191
equals(Runtime.chrome));
193192
});
194193

‎pkg/smith/test/test_matrix_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void main() {
1313
"x64-dart2js-debug-vm-linux": <String, dynamic>{
1414
"options": <String, dynamic>{"enable-asserts": true},
1515
},
16-
"x64-dartdevc-vm-linux": <String, dynamic>{
16+
"x64-ddc-vm-linux": <String, dynamic>{
1717
"options": <String, dynamic>{
1818
"mode": "release",
1919
"enable-asserts": true
@@ -30,8 +30,8 @@ void main() {
3030
enableAsserts: true)));
3131
expect(
3232
testMatrix.configurations[1],
33-
equals(Configuration("x64-dartdevc-vm-linux", Architecture.x64,
34-
Compiler.dartdevc, Mode.release, Runtime.vm, System.linux,
33+
equals(Configuration("x64-ddc-vm-linux", Architecture.x64,
34+
Compiler.ddc, Mode.release, Runtime.vm, System.linux,
3535
enableAsserts: true)));
3636
});
3737

‎pkg/test_runner/lib/src/build_configurations.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ List<String> _selectBuildTargets(Configuration inner) {
8383
Compiler.dartkp: ['runtime', 'dart_precompiled_runtime'],
8484
Compiler.appJitk: ['runtime'],
8585
Compiler.fasta: ['create_sdk', 'dartdevc_test', 'kernel_platform_files'],
86-
Compiler.dartdevk: ['dartdevc_test'],
8786
Compiler.ddc: ['dartdevc_test'],
8887
Compiler.dart2js: ['create_sdk'],
8988
Compiler.dart2analyzer: ['create_sdk', 'utils/dartanalyzer'],
@@ -110,8 +109,7 @@ List<String> _selectBuildTargets(Configuration inner) {
110109
result.add('analyze_snapshot');
111110
}
112111

113-
if ((compiler == Compiler.dartdevk || compiler == Compiler.ddc) &&
114-
!inner.useSdk) {
112+
if (compiler == Compiler.ddc && !inner.useSdk) {
115113
result
116114
..remove('dartdevc_test')
117115
..add('dartdevc_test_local');

‎pkg/test_runner/lib/src/command.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ class DevCompilerCompilationCommand extends CompilationCommand {
327327
required bool alwaysCompile,
328328
String? workingDirectory,
329329
int index = 0})
330-
: super("dartdevc", outputFile, bootstrapDependencies, executable,
331-
arguments, environmentOverrides,
330+
: super("ddc", outputFile, bootstrapDependencies, executable, arguments,
331+
environmentOverrides,
332332
alwaysCompile: alwaysCompile,
333333
workingDirectory: workingDirectory,
334334
index: index);

‎pkg/test_runner/lib/src/command_output.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,8 +1638,6 @@ mixin _StaticErrorOutput on CommandOutput {
16381638
Compiler.dart2analyzer: ErrorSource.analyzer,
16391639
Compiler.dart2js: ErrorSource.web,
16401640
Compiler.dart2wasm: ErrorSource.web,
1641-
Compiler.dartdevc: ErrorSource.web,
1642-
Compiler.dartdevk: ErrorSource.web,
16431641
Compiler.ddc: ErrorSource.web,
16441642
Compiler.fasta: ErrorSource.cfe
16451643
}[testCase.configuration.compiler]!;

‎pkg/test_runner/lib/src/compiler_configuration.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ abstract class CompilerConfiguration {
8686
case Compiler.dart2wasm:
8787
return Dart2WasmCompilerConfiguration(configuration);
8888

89-
case Compiler.dartdevc:
90-
case Compiler.dartdevk:
9189
case Compiler.ddc:
9290
return DevCompilerConfiguration(configuration);
9391

@@ -585,8 +583,7 @@ class Dart2WasmCompilerConfiguration extends CompilerConfiguration {
585583
}
586584
}
587585

588-
/// Configuration for "dartdevc", "dartdevk", and "ddc".
589-
// TODO(nshahan): Cleanup mulitple aliases for the compiler.
586+
/// Configuration for "ddc".
590587
class DevCompilerConfiguration extends CompilerConfiguration {
591588
DevCompilerConfiguration(TestConfiguration configuration)
592589
: super._subclass(configuration);

‎pkg/test_runner/lib/src/configuration.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ class TestConfiguration {
195195
bool get usesFasta {
196196
var fastaCompilers = const [
197197
Compiler.appJitk,
198-
Compiler.dartdevc,
199-
Compiler.dartdevk,
200198
Compiler.ddc,
201199
Compiler.dartk,
202200
Compiler.dartkp,

‎pkg/test_runner/lib/src/options.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ dart2js: Compile to JavaScript using dart2js.
8787
dart2analyzer: Perform static analysis on Dart code using the analyzer.
8888
compare_analyzer_cfe: Compare analyzer and common front end representations.
8989
ddc: Compile to JavaScript using dartdevc.
90-
dartdevc: Compile to JavaScript using dartdevc (same as ddc).
91-
dartdevk: Compile to JavaScript using dartdevc (same as ddc).
9290
app_jitk: Compile the Dart code into Kernel and then into an app
9391
snapshot.
9492
dartk: Compile the Dart code into Kernel before running test.

‎pkg/test_runner/lib/src/process_queue.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,6 @@ class CommandExecutorImpl implements CommandExecutor {
569569
.runCommand(command.displayName, command, timeout, command.arguments);
570570
} else if (command is CompilationCommand &&
571571
(command.displayName == 'dart2js' ||
572-
command.displayName == 'dartdevc' ||
573-
command.displayName == 'dartdevk' ||
574572
command.displayName == 'ddc' ||
575573
command.displayName == 'fasta') &&
576574
globalConfiguration.batch) {

‎pkg/test_runner/lib/src/test_suite.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,6 @@ abstract class TestSuite {
175175
if (testFile.isWebStaticErrorTest &&
176176
const {
177177
Compiler.dart2js,
178-
Compiler.dartdevc,
179-
Compiler.dartdevk,
180178
Compiler.ddc,
181179
}.contains(configuration.compiler)) {
182180
return true;
@@ -967,8 +965,6 @@ class StandardTestSuite extends TestSuite {
967965
const supportedCompilers = {
968966
Compiler.dart2js,
969967
Compiler.dart2wasm,
970-
Compiler.dartdevc,
971-
Compiler.dartdevk,
972968
Compiler.ddc
973969
};
974970
assert(supportedCompilers.contains(configuration.compiler));

‎tests/co19/co19-dartdevc.status

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# for details. All rights reserved. Use of this source code is governed by a
33
# BSD-style license that can be found in the LICENSE file.
44

5-
[ $compiler == dartdevc || $compiler == dartdevk || $compiler == ddc ]
5+
[ $compiler == ddc ]
66
Language/Expressions/Constants/integer_size_t03: SkipByDesign # uses integer literal not representable as JavaScript number
77
Language/Expressions/Constants/integer_size_t04: SkipByDesign # uses integer literal not representable as JavaScript number
88
Language/Expressions/Constants/literal_number_t01: SkipByDesign # uses integer literal not representable as JavaScript number

‎tests/co19_2/co19_2-dartdevc.status

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# for details. All rights reserved. Use of this source code is governed by a
33
# BSD-style license that can be found in the LICENSE file.
44

5-
[ $compiler == dartdevc || $compiler == dartdevk || $compiler == ddc ]
5+
[ $compiler == ddc ]
66
Language/Classes/Constructors/Generative_Constructors/formal_parameter_t07: SkipSlow
77
Language/Classes/Constructors/Generative_Constructors/fresh_instance_t01: SkipSlow
88
Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t01: SkipSlow

‎tests/corelib/corelib.status

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ bigint_parse_radix_test: Slow, Pass # --no_intrinsify
1010
bigint_test/03: SkipSlow # --no_intrinsify
1111
bigint_test/15: SkipSlow # --no_intrinsify
1212

13+
[ $compiler == ddc ]
14+
bigint_test/03: SkipSlow # modPow is very slow
15+
bigint_test/15: SkipSlow # modPow is very slow
16+
list_concurrent_modify_self_test: SkipSlow # missing check causes list to grow to whole heap
17+
regexp/lookbehind_test/01: Skip # Flaky in uncatchable way. Issue 36280
18+
uri_parse_test: Slow, Pass
19+
uri_test: Slow, Pass
20+
1321
[ $mode == debug ]
1422
regexp/pcre_test: Slow, Pass # Issue 22008
1523

@@ -26,7 +34,7 @@ dynamic_nosuchmethod_test: SkipByDesign # Expects names in NSM
2634
error_stack_trace1_test: SkipByDesign # Expects unobfuscated stack trace
2735
type_tostring_test: SkipByDesign # Expects names in Type.toString()
2836

29-
[ $compiler != dart2analyzer && $compiler != dart2js && $compiler != dartdevc && $compiler != dartdevk && $compiler != ddc ]
37+
[ $compiler != dart2analyzer && $compiler != dart2js && $compiler != ddc ]
3038
bigint_js_test: SkipByDesign # JavaScript-specific test
3139

3240
[ $compiler == dart2js && $runtime != none ]
@@ -42,7 +50,7 @@ regexp/unicode-regexp-restricted-syntax_test: Skip # evades flake detection http
4250
[ $runtime != dart_precompiled && $runtime != vm ]
4351
reg_exp_receive_port_test: SkipByDesign # uses SendPort/ReceivePort
4452

45-
[ $runtime != none && ($compiler == dart2js || $compiler == dartdevc || $compiler == dartdevk || $compiler == ddc) ]
53+
[ $runtime != none && ($compiler == dart2js || $compiler == ddc) ]
4654
int_parse_with_limited_ints_test: SkipByDesign # Requires fixed-size int64 support.
4755
integer_arith_vm_test: SkipByDesign # Is a VM optimization test that requires int64 support.
4856
iterable_return_type_int64_test: SkipByDesign # Requires int64 support.
@@ -52,14 +60,6 @@ typed_data_with_limited_ints_test: SkipByDesign # Requires fixed-size int64 supp
5260
bigint_parse_radix_test: Skip # Issue 31659
5361
bigint_test: Skip # Issue 31659
5462

55-
[ $compiler == dartdevc || $compiler == dartdevk || $compiler == ddc ]
56-
bigint_test/03: SkipSlow # modPow is very slow
57-
bigint_test/15: SkipSlow # modPow is very slow
58-
list_concurrent_modify_self_test: SkipSlow # missing check causes list to grow to whole heap
59-
regexp/lookbehind_test/01: Skip # Flaky in uncatchable way. Issue 36280
60-
uri_parse_test: Slow, Pass
61-
uri_test: Slow, Pass
62-
6363
[ $runtime == dart_precompiled || $runtime == vm ]
6464
regexp/global_test: Skip # Issue 21709
6565
regexp/pcre_test: Slow, Pass

‎tests/corelib_2/corelib_2.status

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ bigint_parse_radix_test: Slow, Pass # --no_intrinsify
1010
bigint_test/03: SkipSlow # --no_intrinsify
1111
bigint_test/15: SkipSlow # --no_intrinsify
1212

13+
[ $compiler == ddc ]
14+
bigint_test/03: SkipSlow # modPow is very slow
15+
bigint_test/15: SkipSlow # modPow is very slow
16+
list_concurrent_modify_self_test: SkipSlow # missing check causes list to grow to whole heap
17+
regexp/lookbehind_test/01: Skip # Flaky in uncatchable way. Issue 36280
18+
uri_parse_test: Slow, Pass
19+
uri_test: Slow, Pass
20+
1321
[ $mode == debug ]
1422
regexp/pcre_test: Slow, Pass # Issue 22008
1523

@@ -29,7 +37,7 @@ dynamic_nosuchmethod_test: SkipByDesign # Expects names in NSM
2937
error_stack_trace1_test: SkipByDesign # Expects unobfuscated stack trace
3038
type_tostring_test: SkipByDesign # Expects names in Type.toString()
3139

32-
[ $compiler != dart2analyzer && $compiler != dart2js && $compiler != dartdevc && $compiler != dartdevk && $compiler != ddc ]
40+
[ $compiler != dart2analyzer && $compiler != dart2js && $compiler != ddc ]
3341
bigint_js_test: SkipByDesign # JavaScript-specific test
3442

3543
[ $compiler == dart2js && $runtime != none ]
@@ -45,7 +53,7 @@ regexp/unicode-regexp-restricted-syntax_test: Skip # evades flake detection http
4553
[ $runtime != dart_precompiled && $runtime != vm ]
4654
reg_exp_receive_port_test: SkipByDesign # uses SendPort/ReceivePort
4755

48-
[ $runtime != none && ($compiler == dart2js || $compiler == dartdevc || $compiler == dartdevk || $compiler == ddc) ]
56+
[ $runtime != none && ($compiler == dart2js || $compiler == ddc) ]
4957
int_parse_with_limited_ints_test: SkipByDesign # Requires fixed-size int64 support.
5058
integer_arith_vm_test: SkipByDesign # Is a VM optimization test that requires int64 support.
5159
iterable_return_type_int64_test: SkipByDesign # Requires int64 support.
@@ -55,14 +63,6 @@ typed_data_with_limited_ints_test: SkipByDesign # Requires fixed-size int64 supp
5563
bigint_parse_radix_test: Skip # Issue 31659
5664
bigint_test: Skip # Issue 31659
5765

58-
[ $compiler == dartdevc || $compiler == dartdevk || $compiler == ddc ]
59-
bigint_test/03: SkipSlow # modPow is very slow
60-
bigint_test/15: SkipSlow # modPow is very slow
61-
list_concurrent_modify_self_test: SkipSlow # missing check causes list to grow to whole heap
62-
regexp/lookbehind_test/01: Skip # Flaky in uncatchable way. Issue 36280
63-
uri_parse_test: Slow, Pass
64-
uri_test: Slow, Pass
65-
6666
[ $runtime == dart_precompiled || $runtime == vm ]
6767
regexp/global_test: Skip # Issue 21709
6868
regexp/pcre_test: Slow, Pass

‎tests/dartdevc_2/dartdevc_native_dartdevc.status

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# for details. All rights reserved. Use of this source code is governed by a
33
# BSD-style license that can be found in the LICENSE file.
44

5-
# Sections in this file should contain "$compiler == dartdevc", dartdevk or ddc.
5+
# Sections in this file should contain "$compiler == ddc".

‎tests/language/language_dartdevc.status

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# for details. All rights reserved. Use of this source code is governed by a
33
# BSD-style license that can be found in the LICENSE file.
44

5-
# Sections in this file should contain "$compiler == dartdevc", dartdevk or ddc.
5+
# Sections in this file should contain "$compiler == ddc".
66

7-
[ $compiler == dartdevc || $compiler == dartdevk || $compiler == ddc ]
7+
[ $compiler == ddc ]
88
async_star/async_star_await_for_test: Skip # evades flake detection https://github.com/dart-lang/sdk/issues/51086
99
async_star/throw_in_catch_test: Skip # Times out. Issue 29920
1010
external_abstract_fields/external_fields_test: SkipByDesign # Non-JS-interop external members are not supported

‎tests/language_2/language_2_dartdevc.status

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# for details. All rights reserved. Use of this source code is governed by a
33
# BSD-style license that can be found in the LICENSE file.
44

5-
# Sections in this file should contain "$compiler == dartdevc", dartdevk or ddc.
5+
# Sections in this file should contain "$compiler == ddc".
66

7-
[ ($compiler == dartdevc || $compiler == dartdevk || $compiler == ddc) && ($runtime == ff || $runtime == firefox) ]
8-
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
9-
10-
[ $compiler == dartdevc || $compiler == dartdevk || $compiler == ddc ]
7+
[ $compiler == ddc ]
118
async_star/async_star_await_for_test: Skip # evades flake detection https://github.com/dart-lang/sdk/issues/51086
129
async_star/throw_in_catch_test: Skip # Times out. Issue 29920
1310
external_abstract_fields/external_fields_test: SkipByDesign # Non-JS-interop external members are not supported
1411
number/int64_literal_runtime*_test: Skip # This is testing Dart 2.0 int64 semantics.
1512
superinterface_variance/*: Skip # Issue dart-lang/language#113
1613
vm/*: SkipByDesign # VM only tests.; VM only tests.
14+
15+
[ $compiler == ddc && ($runtime == ff || $runtime == firefox) ]
16+
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

‎tests/lib/lib.status

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ js/static_interop_test/native_error_test: SkipByDesign # Issue 42085. CSP policy
8383
js/static_interop_test/typed_data_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
8484
js/trust_types_test: SkipByDesign # Issue 42085. CSP policy disallows injected JS code
8585

86-
[ $compiler != dart2js && $compiler != dartdevc && $compiler != dartdevk && $compiler != ddc ]
86+
[ $compiler != dart2js && $compiler != ddc ]
8787
web/*: SkipByDesign
8888

8989
[ $runtime == chrome && $system == macos ]

0 commit comments

Comments
 (0)