Fix device doctor path
This is a follow up of https://flutter-review.googlesource.com/c/recipes/+/48700 to fix another place.
Change-Id: I3bab8ae8e2634eb307ac3d289a7928b8bb438974
Bug: https://github.com/flutter/flutter/issues/132070
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/48740
Reviewed-by: Drew Roen <drewroen@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/50221
Commit-Queue: Jesús Guerrero <jsguerrero@google.com>
diff --git a/recipe_modules/os_utils/api.py b/recipe_modules/os_utils/api.py
index 5ea7bf5..0f0bb47 100644
--- a/recipe_modules/os_utils/api.py
+++ b/recipe_modules/os_utils/api.py
@@ -251,6 +251,7 @@
with self.m.step.nest('ios_debug_symbol_doctor'):
cocoon_path = self._checkout_cocoon()
entrypoint = cocoon_path.join(
+ 'cipd_packages',
'device_doctor',
'bin',
'ios_debug_symbol_doctor.dart',
diff --git a/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json b/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
index 985a937..d64219c 100644
--- a/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
+++ b/recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
@@ -133,7 +133,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
diff --git a/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_four_times.json b/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_four_times.json
index 1a4aaa8..793ff02 100644
--- a/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_four_times.json
+++ b/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_four_times.json
@@ -136,7 +136,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
@@ -150,7 +150,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
@@ -167,7 +167,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
@@ -181,7 +181,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
@@ -198,7 +198,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
@@ -212,7 +212,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
@@ -229,7 +229,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
@@ -243,7 +243,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
@@ -260,7 +260,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
diff --git a/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_then_succeeds.json b/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_then_succeeds.json
index 1802d19..78b64af 100644
--- a/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_then_succeeds.json
+++ b/recipe_modules/os_utils/examples/full.expected/ios_debug_symbol_doctor_fails_then_succeeds.json
@@ -136,7 +136,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
@@ -150,7 +150,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
@@ -167,7 +167,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
index 00fbc5c..70694ba 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
@@ -2140,7 +2140,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
@@ -2698,7 +2698,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"recover",
"--cocoon-root",
"[CACHE]/cocoon",
@@ -2750,7 +2750,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 8e872fe..525b0ee 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -2140,7 +2140,7 @@
{
"cmd": [
"dart",
- "[CACHE]/cocoon/device_doctor/bin/ios_debug_symbol_doctor.dart",
+ "[CACHE]/cocoon/cipd_packages/device_doctor/bin/ios_debug_symbol_doctor.dart",
"diagnose"
],
"cwd": "[CACHE]/cocoon/device_doctor",
