Update femu_test.py to deprecate symbol-index tool
Fixed: fxbug.dev/102646
Change-Id: Id9545a625f7c18b22e41efda383d028b37b1fa23
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/34181
Reviewed-by: Alexander Biggs <akbiggs@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Dangyi Liu <dangyi@google.com>
diff --git a/recipes/engine/femu_test.expected/femu_vdl_with_package_list.json b/recipes/engine/femu_test.expected/femu_vdl_with_package_list.json
index fe13065..06b2a2b 100644
--- a/recipes/engine/femu_test.expected/femu_vdl_with_package_list.json
+++ b/recipes/engine/femu_test.expected/femu_vdl_with_package_list.json
@@ -2584,197 +2584,6 @@
},
{
"cmd": [],
- "name": "ensure sdk (5)"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).init fuchsia_sdk cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).check sdk cache content",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-vpython-spec",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
- "-o",
- "GSUtil:software_update_check_period=0",
- "cp",
- "gs://fuchsia/development/0.20200101.0.1/sdk/linux-amd64/gn.tar.gz",
- "[CLEANUP]/fuchsia_sdk_tmp_tmp_5"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).gsutil cp",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/path/to/bsdtar/version%3Apinned-version/bsdtar",
- "--extract",
- "--verbose",
- "-f",
- "[CLEANUP]/fuchsia_sdk_tmp_tmp_5/gn.tar.gz",
- "-C",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).extract sdk gz",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "purge"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Purge debug symbols"
- },
- {
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "add",
- "[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
- "[CACHE]/builder/src/out/fuchsia_debug_x64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Add debug symbols"
- },
- {
- "cmd": [],
"name": "FEMU Test"
},
{
@@ -2785,11 +2594,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,v2_test-123.far",
"--test_suite=v2_test",
"--test_command=run-test-suite fuchsia-pkg://fuchsia.com/v2_test#meta/v2_test.cm -- --gtest_filter=-ParagraphTest.*:a.b",
@@ -2832,11 +2641,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,v2_test-123.far",
"--test_suite=v2_test",
"--test_command=run-test-suite fuchsia-pkg://fuchsia.com/v2_test#meta/v2_test.cm -- --gtest_filter=-ParagraphTest.*:a.b",
@@ -2907,11 +2716,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,v1_test_component-321.far",
"--test_suite=v1_test_component",
"--test_command=run-test-component fuchsia-pkg://fuchsia.com/v1_test_component#meta/v1_test_component.cmx -ParagraphTest.*:a.b",
@@ -2954,11 +2763,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,v1_test_component-321.far",
"--test_suite=v1_test_component",
"--test_command=run-test-component fuchsia-pkg://fuchsia.com/v1_test_component#meta/v1_test_component.cmx -ParagraphTest.*:a.b",
@@ -3022,31 +2831,6 @@
]
},
{
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "remove",
- "[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Remove debug symbols"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipes/engine/femu_test.expected/multiple_non_root_fars.json b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
index eae8919..d72033b 100644
--- a/recipes/engine/femu_test.expected/multiple_non_root_fars.json
+++ b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
@@ -2574,197 +2574,6 @@
},
{
"cmd": [],
- "name": "ensure sdk (5)"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).init fuchsia_sdk cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).check sdk cache content",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-vpython-spec",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
- "-o",
- "GSUtil:software_update_check_period=0",
- "cp",
- "gs://fuchsia/development/0.20200101.0.1/sdk/linux-amd64/gn.tar.gz",
- "[CLEANUP]/fuchsia_sdk_tmp_tmp_5"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).gsutil cp",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/path/to/bsdtar/version%3Apinned-version/bsdtar",
- "--extract",
- "--verbose",
- "-f",
- "[CLEANUP]/fuchsia_sdk_tmp_tmp_5/gn.tar.gz",
- "-C",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).extract sdk gz",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "purge"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Purge debug symbols"
- },
- {
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "add",
- "[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
- "[CACHE]/builder/src/out/fuchsia_debug_x64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Add debug symbols"
- },
- {
- "cmd": [],
"name": "FEMU Test"
},
{
@@ -2775,11 +2584,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,flutter-embedder-test-0.far,child-view.far,parent-view.far",
"--test_suite=flutter-embedder-test",
"--test_command=run-test-component fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/flutter-embedder-test.cmx",
@@ -2822,11 +2631,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,flutter-embedder-test-0.far,child-view.far,parent-view.far",
"--test_suite=flutter-embedder-test",
"--test_command=run-test-component fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/flutter-embedder-test.cmx",
@@ -2890,31 +2699,6 @@
]
},
{
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "remove",
- "[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Remove debug symbols"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipes/engine/femu_test.expected/start_femu_with_vdl.json b/recipes/engine/femu_test.expected/start_femu_with_vdl.json
index 4e40901..012aef2 100644
--- a/recipes/engine/femu_test.expected/start_femu_with_vdl.json
+++ b/recipes/engine/femu_test.expected/start_femu_with_vdl.json
@@ -2576,197 +2576,6 @@
},
{
"cmd": [],
- "name": "ensure sdk (5)"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).init fuchsia_sdk cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).check sdk cache content",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-vpython-spec",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
- "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
- "-o",
- "GSUtil:software_update_check_period=0",
- "cp",
- "gs://fuchsia/development/0.20200101.0.1/sdk/linux-amd64/gn.tar.gz",
- "[CLEANUP]/fuchsia_sdk_tmp_tmp_5"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).gsutil cp",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/path/to/bsdtar/version%3Apinned-version/bsdtar",
- "--extract",
- "--verbose",
- "-f",
- "[CLEANUP]/fuchsia_sdk_tmp_tmp_5/gn.tar.gz",
- "-C",
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "name": "ensure sdk (5).extract sdk gz",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "purge"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Purge debug symbols"
- },
- {
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "add",
- "[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
- "[CACHE]/builder/src/out/fuchsia_debug_x64"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Add debug symbols"
- },
- {
- "cmd": [],
"name": "FEMU Test"
},
{
@@ -2777,11 +2586,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,v2_test-123.far",
"--test_suite=v2_test",
"--test_command=run-test-suite fuchsia-pkg://fuchsia.com/v2_test#meta/v2_test.cm -- --gtest_filter=-ParagraphTest.*:a.b",
@@ -2824,11 +2633,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,v2_test-123.far",
"--test_suite=v2_test",
"--test_command=run-test-suite fuchsia-pkg://fuchsia.com/v2_test#meta/v2_test.cm -- --gtest_filter=-ParagraphTest.*:a.b",
@@ -2899,11 +2708,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,v1_test_component-321.far",
"--test_suite=v1_test_component",
"--test_command=run-test-component fuchsia-pkg://fuchsia.com/v1_test_component#meta/v1_test_component.cmx -ParagraphTest.*:a.b",
@@ -2946,11 +2755,11 @@
"--pm_tool=pm",
"--far_tool=far",
"--fvm_tool=fvm",
- "--symbolizer_tool=./symbolizer",
"--resize_fvm=2G",
"--gpu=swiftshader_indirect",
"--headless_mode=true",
"--system_images=qemu_buildargs,qemu_kernel,qemu_fvm,qemu_zircona-ed25519,ssh_config,id_ed25519.pub,id_ed25519,amber-files",
+ "--symbolizer_cmd=./symbolizer --build-id-dir=[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id",
"--serve_packages=flutter_aot_runner-0.far,v1_test_component-321.far",
"--test_suite=v1_test_component",
"--test_command=run-test-component fuchsia-pkg://fuchsia.com/v1_test_component#meta/v1_test_component.cmx -ParagraphTest.*:a.b",
@@ -3014,31 +2823,6 @@
]
},
{
- "cmd": [
- "[CACHE]/builder/0.20200101.0.1/fuchsia_sdk/linux_intel_64/tools/x64/symbol-index",
- "remove",
- "[CACHE]/builder/src/out/fuchsia_debug_x64/.build-id"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "GOMA_DIR": "[CACHE]/goma/client"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "Remove debug symbols"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipes/engine/femu_test.py b/recipes/engine/femu_test.py
index fe38962..8a65036 100644
--- a/recipes/engine/femu_test.py
+++ b/recipes/engine/femu_test.py
@@ -61,27 +61,6 @@
return targets
-@contextmanager
-def DebugSymbols(api, out_variant):
- symbol_index = api.sdk.sdk_path.join('tools', 'x64', 'symbol-index')
-
- # Purge obsolete debug symbols.
- api.step('Purge debug symbols', [symbol_index, 'purge'])
-
- # Add debug symbols.
- checkout = GetCheckoutPath(api)
- out_dir = checkout.join('out/%s' % out_variant)
- build_id_dir = checkout.join('out/%s/.build-id' % out_variant)
- api.step('Add debug symbols', [symbol_index, 'add', build_id_dir, out_dir])
-
- # Run context with debug symbols.
- try:
- yield
- finally:
- # Remove debug symbols.
- api.step('Remove debug symbols', [symbol_index, 'remove', build_id_dir])
-
-
def BuildAndTestFuchsia(api, build_script, git_rev):
RunGN(api, '--fuchsia', '--fuchsia-cpu', 'x64', '--runtime-mode', 'debug',
'--no-lto')
@@ -225,7 +204,6 @@
cmd.append('--pm_tool=pm')
cmd.append('--far_tool=far')
cmd.append('--fvm_tool=fvm')
- cmd.append('--symbolizer_tool=./symbolizer')
cmd.append('--resize_fvm=2G')
cmd.append('--gpu=swiftshader_indirect')
cmd.append('--headless_mode=true')
@@ -244,8 +222,12 @@
amber_files='amber-files',
))
- with DebugSymbols(api, 'fuchsia_debug_x64'), api.context(cwd=root_dir), \
- api.step.nest('FEMU Test'), api.step.defer_results():
+ # Symbolization
+ checkout = GetCheckoutPath(api)
+ build_id_dir = checkout.join('out/fuchsia_debug_x64/.build-id')
+ cmd.append('--symbolizer_cmd=./symbolizer --build-id-dir={}'.format(build_id_dir))
+
+ with api.context(cwd=root_dir), api.step.nest('FEMU Test'), api.step.defer_results():
for suite in test_suites:
test_cmd = cmd + [
'--serve_packages=flutter_aot_runner-0.far,%s' % ','.join(suite['package_basenames']),
diff --git a/recipes/engine/femu_test.resources/run_vdl_test.sh b/recipes/engine/femu_test.resources/run_vdl_test.sh
index df43979..d04b063 100644
--- a/recipes/engine/femu_test.resources/run_vdl_test.sh
+++ b/recipes/engine/femu_test.resources/run_vdl_test.sh
@@ -51,7 +51,7 @@
VDL_LOCATION="device_launcher"
EMULATOR_LOG="raw_emulator.log"
SYSLOG="syslog.log"
-SYMBOLIZER_TOOL=""
+SYMBOLIZER_CMD=""
SSH_CONFIG="ssh_config"
SSH_KEY="id_ed25519"
TEST_SUITE=""
@@ -78,8 +78,8 @@
SYSLOG="${2}"
shift
;;
- --symbolizer_tool=*)
- SYMBOLIZER_TOOL="${arg#*=}"
+ --symbolizer_cmd=*)
+ SYMBOLIZER_CMD="${arg#*=}"
;;
--test_suite=*)
TEST_SUITE="${arg#*=}"
@@ -96,7 +96,7 @@
done
log "VDL Location: ${VDL_LOCATION}"
-log "Symbolizer Location: ${SYMBOLIZER_TOOL}"
+log "Symbolizer Command: ${SYMBOLIZER_CMD}"
log "VDL Args: ${VDL_ARGS[@]}"
log "TEST_SUITE: ${TEST_SUITE}"
log "TEST_COMMAND: ${TEST_COMMAND}"
@@ -148,7 +148,8 @@
if [[ ${_LAUNCH_EXIT_CODE} == 0 ]]; then
log "Successfully launched virtual device proto ${VDL_PROTO}"
- ssh_to_guest "log_listener" | "${SYMBOLIZER_TOOL}" >"${SYSLOG}" 2>&1 &
+ # SYMBOLIZER_CMD could contain arguments so don't quote it.
+ ssh_to_guest "log_listener" | ${SYMBOLIZER_CMD} >"${SYSLOG}" 2>&1 &
ssh_to_guest "${TEST_COMMAND}"
_TEST_EXIT_CODE=$?
