[HHH] update ENGINE_PATH
After https://dart-review.googlesource.com/c/recipes/+/175080 the
ENGINE_PATH should have an extra folder.
ENGINE_PATH: /b/s/w/ir/cache/builder is failing.
ENGINE_PATH: /b/s/w/ir/cache/builder/engine should work.
The following works locally, indicating ENGINE_PATH should point to the
engine folder:
ENGINE_PATH=~/flt/engine WEB_UI_DIR=~/flt/engine/src/flutter/lib/web_ui/ src/flutter/lib/web_ui/dev/web_engine_analysis.sh
Change-Id: I551def9d65932287430e3ce9c805dfdb8f43d2d2
Reviewed-on: https://dart-review.googlesource.com/c/recipes/+/176260
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
diff --git a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
index 21b0c47..36edca1 100644
--- a/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
+++ b/recipes/dart/flutter_engine.expected/flutter-engine-linux.json
@@ -6318,7 +6318,7 @@
"ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
"ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GOMA_DIR": "[CACHE]/goma/client",
"PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
"TEST_COMMIT_RANGE": "HEAD",
diff --git a/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json b/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
index 57e1ba5..3f17ed9 100644
--- a/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
+++ b/recipes/dart/flutter_engine.expected/only-run-webtests-suite.json
@@ -6318,7 +6318,7 @@
"ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
"ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GOMA_DIR": "[CACHE]/goma/client",
"PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
"TEST_COMMIT_RANGE": "HEAD",
diff --git a/recipes/dart/flutter_engine.expected/run-all-test-suites.json b/recipes/dart/flutter_engine.expected/run-all-test-suites.json
index 21b0c47..36edca1 100644
--- a/recipes/dart/flutter_engine.expected/run-all-test-suites.json
+++ b/recipes/dart/flutter_engine.expected/run-all-test-suites.json
@@ -6318,7 +6318,7 @@
"ANALYZER_STATE_LOCATION_OVERRIDE": "[CACHE]/builder/.dartServer",
"ANDROID_SDK_ROOT": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
"CHROME_EXECUTABLE": "[CACHE]/builder/engine/src/flutter/third_party/browsers/chrome/chrome/google-chrome",
- "ENGINE_PATH": "[CACHE]/builder",
+ "ENGINE_PATH": "[CACHE]/builder/engine",
"GOMA_DIR": "[CACHE]/goma/client",
"PATH": "[CACHE]/builder/engine/src/out/host_debug/dart-sdk/bin:<PATH>",
"TEST_COMMIT_RANGE": "HEAD",
diff --git a/recipes/dart/flutter_engine.py b/recipes/dart/flutter_engine.py
index 1d1c583..a68cd5b 100644
--- a/recipes/dart/flutter_engine.py
+++ b/recipes/dart/flutter_engine.py
@@ -325,7 +325,7 @@
with api.context(
env={
- 'ENGINE_PATH': start_dir,
+ 'ENGINE_PATH': start_dir.join('engine'),
'WEB_UI_DIR': engine_src.join('flutter', 'lib', 'web_ui')
}):
api.step(
