Fix global tests doing nothing. (flutter/engine#45097)

This was related to using tests property which is expected for tests running within a build and tasks property used for global tests.

Bug: flutter/flutter#133301

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
This commit is contained in:
godofredoc
2023-08-25 07:23:19 -07:00
committed by GitHub
parent 6d7519402f
commit 7fe20d02e9
4 changed files with 293 additions and 216 deletions

View File

@@ -14,8 +14,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -53,8 +52,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -93,8 +91,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -133,8 +130,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -172,8 +168,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -212,8 +207,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false

View File

@@ -15,9 +15,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -49,21 +47,7 @@
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_debug",
"parameters": [
"--variant",
"host_debug",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
}
},
{
"archives": [
@@ -79,9 +63,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -108,21 +90,7 @@
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_profile",
"parameters": [
"--variant",
"host_profile",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
}
},
{
"archives": [
@@ -139,9 +107,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
"os=Mac-12"
],
"dependencies": [
{
@@ -178,20 +144,7 @@
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
},
"tests": [
{
"language": "python3",
"name": "Impeller-golden, dart and engine tests for host_release",
"parameters": [
"--variant",
"host_release",
"--type",
"dart,engine,impeller-golden"
],
"script": "flutter/testing/run_tests.py"
}
]
}
},
{
"archives": [
@@ -208,8 +161,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -255,8 +207,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -299,8 +250,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -476,5 +426,99 @@
"destination": "darwin-x64-release/gen_snapshot.zip",
"realm": "production"
}
],
"tests": [
{
"name": "Mac Host Tests for host_debug",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"host_debug"
],
"tasks": [
{
"language": "python3",
"name": "Host Tests for host_debug",
"parameters": [
"--variant",
"host_debug",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
},
{
"name": "Mac Impeller-golden, dart and engine tests for host_release",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"host_release"
],
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
}
],
"tasks": [
{
"language": "python3",
"name": "Impeller-golden, dart and engine tests for host_release",
"parameters": [
"--variant",
"host_release",
"--type",
"dart,engine,impeller-golden"
],
"script": "flutter/testing/run_tests.py"
}
]
},
{
"name": "Mac Host Tests for host_profile",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"host_profile"
],
"tasks": [
{
"language": "python3",
"name": "Host Tests for host_profile",
"parameters": [
"--variant",
"host_profile",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
}
]
}

View File

@@ -3,7 +3,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
@@ -26,7 +25,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
@@ -50,7 +48,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
@@ -74,7 +71,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
@@ -99,7 +95,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [

View File

@@ -1,19 +1,9 @@
{
"builds": [
{
"archives": [
{
"base_path": "out/host_debug_unopt/zip_archives/",
"type": "gcs",
"include_paths": [],
"name": "host_debug_unopt"
}
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@@ -35,31 +25,9 @@
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_debug_unopt",
"parameters": [
"--variant",
"host_debug_unopt",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
}
},
{
"archives": [
{
"base_path": "out/ios_debug_sim/zip_archives/",
"type": "gcs",
"include_paths": [],
"name": "ios_debug_sim"
}
],
"properties": {
"$flutter/osx_sdk": {
"runtime_versions": [
@@ -72,7 +40,7 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
@@ -91,8 +59,166 @@
"flutter/testing/scenario_app",
"flutter/shell/platform/darwin/ios:ios_test_flutter"
]
}
},
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
},
"tests": [
"gn": [
"--runtime-mode",
"debug",
"--unoptimized",
"--no-lto",
"--prebuilt-dart-sdk",
"--force-mac-arm64",
"--mac-cpu",
"arm64"
],
"name": "host_debug_unopt_arm64",
"ninja": {
"config": "host_debug_unopt_arm64"
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
}
},
{
"properties": {
"$flutter/osx_sdk": {
"runtime_versions": [
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c"
}
},
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--ios",
"--runtime-mode",
"debug",
"--simulator",
"--no-lto",
"--force-mac-arm64",
"--simulator-cpu",
"arm64"
],
"name": "ios_debug_sim_arm64",
"ninja": {
"config": "ios_debug_sim_arm64",
"targets": [
"flutter/testing/scenario_app",
"flutter/shell/platform/darwin/ios:ios_test_flutter"
]
}
},
{
"properties": {
"$flutter/osx_sdk": {
"runtime_versions": [
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c"
}
},
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--ios",
"--runtime-mode",
"debug",
"--simulator",
"--no-lto",
"--force-mac-arm64",
"--simulator-cpu",
"arm64",
"--darwin-extension-safe"
],
"name": "ios_debug_sim_arm64_extension_safe",
"ninja": {
"config": "ios_debug_sim_arm64_extension_safe",
"targets": [
"flutter/testing/scenario_app",
"flutter/shell/platform/darwin/ios:ios_test_flutter"
]
}
}
],
"tests": [
{
"name": "Mac Host Tests for host_debug_unopt",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"host_debug_unopt"
],
"tasks": [
{
"language": "python3",
"name": "Host Tests for host_debug_unopt",
"parameters": [
"--variant",
"host_debug_unopt",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
},
{
"name": "Mac Tests for ios_debug_sim",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"ios_debug_sim"
],
"contexts": [
"osx_sdk"
],
"properties": {
"$flutter/osx_sdk": {
"runtime_versions": [
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c"
}
},
"tasks": [
{
"language": "python3",
"name": "Tests for ios_debug_sim",
@@ -117,15 +243,8 @@
]
},
{
"archives": [
{
"base_path": "out/host_debug_unopt_arm64/zip_archives/",
"type": "gcs",
"include_paths": [
],
"name": "host_debug_unopt_arm64"
}
],
"name": "Mac Tests for ios_debug_sim_arm64",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
@@ -134,37 +253,11 @@
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--runtime-mode",
"debug",
"--unoptimized",
"--no-lto",
"--prebuilt-dart-sdk",
"--force-mac-arm64",
"--mac-cpu",
"arm64"
"dependencies": [
"ios_debug_sim_arm64"
],
"name": "host_debug_unopt_arm64",
"ninja": {
"config": "host_debug_unopt_arm64",
"targets": [
]
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
}
},
{
"archives": [
{
"base_path": "out/ios_debug_sim_arm64/zip_archives/",
"type": "gcs",
"include_paths": [
],
"name": "ios_debug_sim_arm64"
}
"contexts": [
"osx_sdk"
],
"properties": {
"$flutter/osx_sdk": {
@@ -175,33 +268,7 @@
"sdk_version": "14e300c"
}
},
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--ios",
"--runtime-mode",
"debug",
"--simulator",
"--no-lto",
"--force-mac-arm64",
"--simulator-cpu",
"arm64"
],
"name": "ios_debug_sim_arm64",
"ninja": {
"config": "ios_debug_sim_arm64",
"targets": [
"flutter/testing/scenario_app",
"flutter/shell/platform/darwin/ios:ios_test_flutter"
]
},
"tests": [
"tasks": [
{
"language": "python3",
"name": "Tests for ios_debug_sim_arm64",
@@ -223,18 +290,23 @@
],
"script": "flutter/testing/scenario_app/run_ios_tests.sh"
}
]
},
{
"archives": [
{
"base_path": "out/ios_debug_sim_arm64_extension_safe/zip_archives/",
"type": "gcs",
"include_paths": [
],
"name": "ios_debug_sim_arm64_extension_safe"
}
"name": "Mac Tests for ios_debug_sim_arm64_extension_safe",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"ios_debug_sim_arm64_extension_safe"
],
"contexts": [
"osx_sdk"
],
"properties": {
"$flutter/osx_sdk": {
@@ -245,34 +317,7 @@
"sdk_version": "14e300c"
}
},
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false
},
"gn": [
"--ios",
"--runtime-mode",
"debug",
"--simulator",
"--no-lto",
"--force-mac-arm64",
"--simulator-cpu",
"arm64",
"--darwin-extension-safe"
],
"name": "ios_debug_sim_arm64_extension_safe",
"ninja": {
"config": "ios_debug_sim_arm64_extension_safe",
"targets": [
"flutter/testing/scenario_app",
"flutter/shell/platform/darwin/ios:ios_test_flutter"
]
},
"tests": [
"tasks": [
{
"language": "python3",
"name": "Tests for ios_debug_sim_arm64_extension_safe",
@@ -294,7 +339,6 @@
],
"script": "flutter/testing/scenario_app/run_ios_tests.sh"
}
]
}
]