diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml index 9059379688..2ea5523b59 100644 --- a/engine/src/flutter/.ci.yaml +++ b/engine/src/flutter/.ci.yaml @@ -576,8 +576,6 @@ targets: - name: Windows windows_host_engine_test recipe: engine_v2/engine_v2 - # TODO(matanlurey): Enable (https://github.com/flutter/flutter/issues/161990). - bringup: true timeout: 120 properties: config_name: windows_host_engine_test diff --git a/engine/src/flutter/ci/builders/windows_host_engine.json b/engine/src/flutter/ci/builders/windows_host_engine.json index 46104111c9..81ecdbcc2a 100644 --- a/engine/src/flutter/ci/builders/windows_host_engine.json +++ b/engine/src/flutter/ci/builders/windows_host_engine.json @@ -58,20 +58,7 @@ "flutter/build/archives:windows_flutter", "flutter/impeller/toolkit/interop:sdk" ] - }, - "tests": [ - { - "language": "python3", - "name": "Host Tests for host_debug", - "script": "flutter/testing/run_tests.py", - "parameters": [ - "--variant", - "ci/host_debug", - "--type", - "engine" - ] - } - ] + } }, { "archives": [ diff --git a/engine/src/flutter/ci/builders/windows_host_engine_test.json b/engine/src/flutter/ci/builders/windows_host_engine_test.json index ce51d75691..84b40d3d09 100644 --- a/engine/src/flutter/ci/builders/windows_host_engine_test.json +++ b/engine/src/flutter/ci/builders/windows_host_engine_test.json @@ -16,17 +16,17 @@ }, "gn": [ "--target-dir", - "ci/host_debug", + "ci/host_debug_test", "--runtime-mode", "debug", "--no-lto", "--no-goma", "--rbe" ], - "name": "ci\\host_debug", + "name": "ci\\host_debug_test", "description": "Builds host-side unit tests for Windows.", "ninja": { - "config": "ci/host_debug", + "config": "ci/host_debug_test", "targets": [ "flutter:unittests" ] @@ -34,11 +34,11 @@ "tests": [ { "language": "python3", - "name": "Host Tests for host_debug", + "name": "Host Tests for host_debug_test", "script": "flutter/testing/run_tests.py", "parameters": [ "--variant", - "ci/host_debug", + "ci/host_debug_test", "--type", "engine" ] diff --git a/engine/src/flutter/tools/pkg/engine_build_configs/bin/check.dart b/engine/src/flutter/tools/pkg/engine_build_configs/bin/check.dart index b7d135c17a..54b96eb2f6 100644 --- a/engine/src/flutter/tools/pkg/engine_build_configs/bin/check.dart +++ b/engine/src/flutter/tools/pkg/engine_build_configs/bin/check.dart @@ -177,13 +177,7 @@ void run( ); } if (build.tests.isNotEmpty) { - // TODO(matanlurey): https://github.com/flutter/flutter/issues/161990. - if (target.properties.configName == 'windows_host_engine' && - build.name == r'ci\host_debug') { - debugPrint(' Skipping: ${build.name}: Allow-listed during migration'); - } else { - configConventionErrors.add('${build.name}: Includes "tests: [ ... ]"'); - } + configConventionErrors.add('${build.name}: Includes "tests: [ ... ]"'); } } } diff --git a/engine/src/flutter/tools/pkg/engine_build_configs/test/check_integration_test.dart b/engine/src/flutter/tools/pkg/engine_build_configs/test/check_integration_test.dart index 278baec3db..e70792a876 100644 --- a/engine/src/flutter/tools/pkg/engine_build_configs/test/check_integration_test.dart +++ b/engine/src/flutter/tools/pkg/engine_build_configs/test/check_integration_test.dart @@ -200,22 +200,6 @@ void main() { expect(stderr.toString(), contains('❌ All builder files conform to release_build standards')); }); - test('allows a release builder if allow-listed', () { - addConfig('windows_host_engine', [ - { - 'name': r'ci\host_debug', - 'archives': [ - { - 'include_paths': ['out/foo'], - }, - ], - 'tests': [{}], - }, - ], releaseBuild: true); - - run(['--engine-src-path=${tmpFlutterEngineSrc.path}']); - }); - test('fails if archives.include_paths is empty', () { addConfig('linux_engine', [ {