From e97329da4954052333e5dfb13f9041a92bc25c91 Mon Sep 17 00:00:00 2001 From: Karl Klose Date: Thu, 6 May 2021 06:14:54 +0000 Subject: [PATCH] Revert "[pkg/test_runner] Write experiments to results.json" This reverts commit 4e34ea06a9ed5de40b0ea37b538389dd7a1bf6e7. Reason for revert: The data does not show up in bigquery Original change's description: > [pkg/test_runner] Write experiments to results.json > > Change-Id: I32423ddf665a24443de1ad60ca8f323f5c6d3aca > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196489 > Reviewed-by: Alexander Thomas > Commit-Queue: Karl Klose TBR=karlklose@google.com,athom@google.com Change-Id: Ifccdf3a6031dd55bebfe5d282bcce21c5ab5632a No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/198403 Reviewed-by: Karl Klose Commit-Queue: Karl Klose --- pkg/test_runner/lib/src/compiler_configuration.dart | 6 ++++-- pkg/test_runner/lib/src/test_case.dart | 10 ---------- pkg/test_runner/lib/src/test_progress.dart | 5 ++--- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart index 95c7dcbee46..55bf077ec5a 100644 --- a/pkg/test_runner/lib/src/compiler_configuration.dart +++ b/pkg/test_runner/lib/src/compiler_configuration.dart @@ -9,7 +9,6 @@ import 'configuration.dart'; import 'path.dart'; import 'repository.dart'; import 'runtime_configuration.dart'; -import 'test_case.dart' show TestCase; import 'test_file.dart'; import 'utils.dart'; @@ -26,7 +25,10 @@ List _replaceDartFiles(List list, String replacement) { /// list allows the result of calling this to be spread into another list. List _experimentsArgument( TestConfiguration configuration, TestFile testFile) { - var experiments = TestCase.getExperiments(testFile, configuration); + var experiments = { + ...configuration.experiments, + ...testFile.experiments, + }; if (experiments.isEmpty) { return const []; } diff --git a/pkg/test_runner/lib/src/test_case.dart b/pkg/test_runner/lib/src/test_case.dart index 995bf0a87b7..9316d765aed 100644 --- a/pkg/test_runner/lib/src/test_case.dart +++ b/pkg/test_runner/lib/src/test_case.dart @@ -66,16 +66,6 @@ class TestCase { assert(commands.isNotEmpty); } - List get experiments => getExperiments(testFile, configuration); - - static List getExperiments( - TestFile testFile, TestConfiguration configuration) { - return [ - ...testFile.experiments, - ...configuration.experiments, - ]; - } - TestCase indexedCopy(int index) { var newCommands = commands.map((c) => c.indexedCopy(index)).toList(); return TestCase(displayName, newCommands, configuration, expectedOutcomes, diff --git a/pkg/test_runner/lib/src/test_progress.dart b/pkg/test_runner/lib/src/test_progress.dart index 8d01e3de78b..a089688a371 100644 --- a/pkg/test_runner/lib/src/test_progress.dart +++ b/pkg/test_runner/lib/src/test_progress.dart @@ -656,7 +656,7 @@ class ResultWriter extends EventListener { var testName = name.substring(index + 1); var time = test.commandOutputs.values.fold(Duration.zero, (d, o) => d + o.time); - var experiments = test.experiments; + var record = { "name": name, "configuration": test.configuration.configuration.name, @@ -665,8 +665,7 @@ class ResultWriter extends EventListener { "time_ms": time.inMilliseconds, "result": test.realResult.toString(), "expected": test.realExpected.toString(), - "matches": test.realResult.canBeOutcomeOf(test.realExpected), - if (experiments.isNotEmpty) "experiments": experiments, + "matches": test.realResult.canBeOutcomeOf(test.realExpected) }; _results.add(record); if (test.configuration.writeLogs && record['matches'] != true) {