diff --git a/dev/bots/test.dart b/dev/bots/test.dart index e9a47f6905..01c2c2e104 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -194,28 +194,26 @@ Future _runTests() async { print('${bold}DONE: All tests successful.$reset'); } -// TODO(yjbanov): re-enable coverage collection when https://github.com/dart-lang/sdk/issues/34841 is fixed. Future _runCoverage() async { - print('${bold}DONE: Coverage collection SKIPPED due to https://github.com/dart-lang/sdk/issues/34841.$reset'); - // final File coverageFile = File(path.join(flutterRoot, 'packages', 'flutter', 'coverage', 'lcov.info')); - // if (!coverageFile.existsSync()) { - // print('${red}Coverage file not found.$reset'); - // print('Expected to find: ${coverageFile.absolute}'); - // print('This file is normally obtained by running `flutter update-packages`.'); - // exit(1); - // } - // coverageFile.deleteSync(); - // await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter'), - // options: const ['--coverage'], - // ); - // if (!coverageFile.existsSync()) { - // print('${red}Coverage file not found.$reset'); - // print('Expected to find: ${coverageFile.absolute}'); - // print('This file should have been generated by the `flutter test --coverage` script, but was not.'); - // exit(1); - // } + final File coverageFile = File(path.join(flutterRoot, 'packages', 'flutter', 'coverage', 'lcov.info')); + if (!coverageFile.existsSync()) { + print('${red}Coverage file not found.$reset'); + print('Expected to find: ${coverageFile.absolute}'); + print('This file is normally obtained by running `flutter update-packages`.'); + exit(1); + } + coverageFile.deleteSync(); + await _runFlutterTest(path.join(flutterRoot, 'packages', 'flutter'), + options: const ['--coverage'], + ); + if (!coverageFile.existsSync()) { + print('${red}Coverage file not found.$reset'); + print('Expected to find: ${coverageFile.absolute}'); + print('This file should have been generated by the `flutter test --coverage` script, but was not.'); + exit(1); + } - // print('${bold}DONE: Coverage collection successful.$reset'); + print('${bold}DONE: Coverage collection successful.$reset'); } Future _pubRunTest( diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart index 193c15db29..5e6f1fb8af 100644 --- a/packages/flutter_tools/lib/src/test/flutter_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart @@ -239,7 +239,7 @@ class _Compiler { trackWidgetCreation: trackWidgetCreation, compilerMessageConsumer: reportCompilerMessage, initializeFromDill: testFilePath, - unsafePackageSerialization: true, + unsafePackageSerialization: false, ); }