Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 0986b2b

Browse files
committed
Clean up test.py named configurations code
Drops the debug printing of configurations, and the checking that the named configurations agree with the flags passed. Change-Id: Id19ca002668a757d44017873a5d0c8bb06472564 Reviewed-on: https://dart-review.googlesource.com/68680 Reviewed-by: William Hesse <[email protected]>
1 parent df9ca4c commit 0986b2b

File tree

3 files changed

+0
-32
lines changed

3 files changed

+0
-32
lines changed

tools/bots/test_matrix.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,13 @@
309309
"options": {
310310
"minified": true,
311311
"csp": true,
312-
"preview-dart-2": false,
313312
"use-sdk": true
314313
}},
315314
"dart2js-minified-faststartup-csp-linux-chrome": {
316315
"options": {
317316
"minified": true,
318317
"csp": true,
319318
"fast-startup": true,
320-
"preview-dart-2": false,
321319
"use-sdk": true
322320
}},
323321
"dart2js-minified-linux-d8": {

tools/testing/dart/configuration.dart

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -383,33 +383,6 @@ class TestConfiguration {
383383
print("-rflutter is applicable only for --arch=x64");
384384
}
385385

386-
if (namedConfiguration != null) {
387-
if ( // namedConfiguration.builderTag != builderTag || # Null versus empty string
388-
// namedConfiguration.architecture != architecture || # smith.Architecture vs Architecture
389-
// namedConfiguration.compiler != compiler ||
390-
namedConfiguration.isChecked != isChecked ||
391-
namedConfiguration.isCsp != isCsp ||
392-
namedConfiguration.isHostChecked != isHostChecked ||
393-
namedConfiguration.isMinified != isMinified ||
394-
// namedConfiguration.mode != mode ||
395-
namedConfiguration.previewDart2 == noPreviewDart2 ||
396-
// namedConfiguration.runtime != runtime ||
397-
// namedConfiguration.system != system ||
398-
// namedConfiguration.timeout != _timeout || #? Null?
399-
namedConfiguration.useBlobs != useBlobs ||
400-
namedConfiguration.useFastStartup != useFastStartup ||
401-
namedConfiguration.useHotReload != hotReload ||
402-
namedConfiguration.useHotReloadRollback != hotReloadRollback ||
403-
namedConfiguration.useSdk != useSdk
404-
// namedConfiguration.vmOptions != vmOptions # String vs List<String>
405-
) {
406-
print(
407-
"Configuration and namedConfiguration differ: ${toSummaryMap()} $namedConfiguration"
408-
"$builderTag ${namedConfiguration.builderTag}");
409-
isValid = false;
410-
}
411-
}
412-
413386
return isValid;
414387
}
415388

tools/testing/dart/options.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,6 @@ compiler.''',
638638
mode,
639639
architecture,
640640
system);
641-
print(namedConfiguration); // TODO(whesse): remove
642641
var innerConfiguration = new Configuration(
643642
namedConfiguration?.name ?? "custom configuration",
644643
architecture,
@@ -864,7 +863,6 @@ Options:''');
864863

865864
Configuration getNamedConfiguration(String template, Runtime runtime,
866865
Compiler compiler, Mode mode, Architecture architecture, System system) {
867-
print(template);
868866
if (template == null) return null;
869867
if (template.contains(r"${runtime}")) {
870868
template = template.replaceFirst(r"${runtime}", runtime.name);
@@ -884,7 +882,6 @@ Configuration getNamedConfiguration(String template, Runtime runtime,
884882
}
885883

886884
TestMatrix testMatrix = TestMatrix.fromPath("tools/bots/test_matrix.json");
887-
print("Expanded namedConfiguration name:$template");
888885
return testMatrix.configurations
889886
.singleWhere((c) => c.name == template, orElse: () => null);
890887
}

0 commit comments

Comments
 (0)