From 66b4d6fbf99265d939a6887de568f45eb2416a87 Mon Sep 17 00:00:00 2001 From: fangting Date: Tue, 18 Mar 2025 10:03:49 +0800 Subject: [PATCH 1/9] fix all_dependent_configs Issue:#IBU5CE Signed-off-by: fangting --- build/third_party_gn/icu/icu4c/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/third_party_gn/icu/icu4c/BUILD.gn b/build/third_party_gn/icu/icu4c/BUILD.gn index 67d5a36a..ad2d5094 100644 --- a/build/third_party_gn/icu/icu4c/BUILD.gn +++ b/build/third_party_gn/icu/icu4c/BUILD.gn @@ -509,7 +509,7 @@ ohos_shared_library("shared_icuuc") { ":icu_config", "$build_root/config/compiler:rtti", ] - all_dependent_configs = [ ":static_icustubdata_all_deps_config" ] + public_configs = [ ":static_icustubdata_all_deps_config" ] defines = [ "U_ATTRIBUTE_DEPRECATED=", "U_COMMON_IMPLEMENTATION", -- Gitee From 5f0285c6a594a8305b5352616ee5c34ab2ad14ca Mon Sep 17 00:00:00 2001 From: yanzhiqi1 Date: Wed, 19 Mar 2025 15:29:20 +0800 Subject: [PATCH 2/9] Fix toolchain ut Issue: #IBUNB0 Signed-off-by: yanzhiqi1 --- tooling/test/BUILD.gn | 3 +-- tooling/test/testcases/js_accelerate_launch_test.h | 2 +- tooling/test/testcases/js_allocationtrack_loop_test.h | 2 +- tooling/test/testcases/js_allocationtrack_recursion_test.h | 2 +- tooling/test/testcases/js_allocationtrack_test.h | 2 +- tooling/test/testcases/js_breakpoint_arrow_test.h | 2 +- tooling/test/testcases/js_breakpoint_async_test.h | 2 +- tooling/test/testcases/js_breakpoint_cannot_hit_test.h | 2 +- tooling/test/testcases/js_breakpoint_in_different_branch.h | 2 +- tooling/test/testcases/js_breakpoint_loop_test.h | 2 +- tooling/test/testcases/js_breakpoint_recursion_test.h | 2 +- tooling/test/testcases/js_breakpoint_switch_test.h | 2 +- tooling/test/testcases/js_breakpoint_test.h | 2 +- tooling/test/testcases/js_closure_scope_test.h | 2 +- tooling/test/testcases/js_container_test.h | 2 +- tooling/test/testcases/js_cpuprofile_async_test.h | 2 +- tooling/test/testcases/js_cpuprofile_loop_test.h | 2 +- tooling/test/testcases/js_cpuprofile_recursion_test.h | 2 +- tooling/test/testcases/js_cpuprofile_step_test.h | 2 +- tooling/test/testcases/js_cpuprofile_test.h | 2 +- tooling/test/testcases/js_dropframe_test.h | 2 +- tooling/test/testcases/js_exception_test.h | 2 +- tooling/test/testcases/js_heapdump_loop_test.h | 2 +- tooling/test/testcases/js_heapdump_test.h | 2 +- tooling/test/testcases/js_heapprofiler_dump_test.h | 2 +- tooling/test/testcases/js_heapsampling_loop_test.h | 2 +- tooling/test/testcases/js_heapsampling_test.h | 2 +- tooling/test/testcases/js_heapusage_async_test.h | 2 +- tooling/test/testcases/js_heapusage_loop_test.h | 2 +- tooling/test/testcases/js_heapusage_recursion_test.h | 2 +- tooling/test/testcases/js_heapusage_step_test.h | 2 +- tooling/test/testcases/js_heapusage_test.h | 2 +- tooling/test/testcases/js_local_variable_scope_test.h | 2 +- .../test/testcases/js_multiple_breakpoint_in_function_test.h | 2 +- tooling/test/testcases/js_multiple_common_breakpoint_test.h | 2 +- tooling/test/testcases/js_range_error_test.h | 2 +- tooling/test/testcases/js_single_step_test.h | 2 +- tooling/test/testcases/js_smart_stepInto_test.h | 2 +- tooling/test/testcases/js_source_test.h | 2 +- tooling/test/testcases/js_special_location_breakpoint_test.h | 2 +- tooling/test/testcases/js_step_into_test.h | 2 +- tooling/test/testcases/js_step_out_test.h | 2 +- tooling/test/testcases/js_step_over_test.h | 2 +- tooling/test/testcases/js_stepinto_and_stepout_test.h | 2 +- tooling/test/testcases/js_stepinto_arrow_test.h | 2 +- tooling/test/testcases/js_stepinto_async_test.h | 2 +- tooling/test/testcases/js_stepinto_loop_test.h | 2 +- tooling/test/testcases/js_stepinto_recursion_test.h | 2 +- tooling/test/testcases/js_stepinto_switch_test.h | 2 +- tooling/test/testcases/js_stepinto_test.h | 2 +- tooling/test/testcases/js_stepout_arrow_test.h | 2 +- tooling/test/testcases/js_stepout_async_test.h | 2 +- tooling/test/testcases/js_stepout_before_function_test.h | 2 +- tooling/test/testcases/js_stepout_loop_test.h | 2 +- tooling/test/testcases/js_stepout_recursion_test.h | 2 +- tooling/test/testcases/js_stepout_switch_test.h | 2 +- tooling/test/testcases/js_stepout_test.h | 2 +- tooling/test/testcases/js_stepover_loop_test.h | 2 +- tooling/test/testcases/js_stepover_recursion_test.h | 2 +- tooling/test/testcases/js_stepover_switch_test.h | 2 +- tooling/test/testcases/js_stepover_test.h | 2 +- tooling/test/testcases/js_syntax_exception_test.h | 2 +- tooling/test/testcases/js_throw_exception_test.h | 2 +- tooling/test/testcases/js_tracing_test.h | 2 +- tooling/test/testcases/js_variable_first_test.h | 2 +- tooling/test/testcases/js_variable_second_test.h | 2 +- tooling/test/testcases/js_watch_basic_type_test.h | 2 +- tooling/test/testcases/js_watch_closure_variable_test.h | 2 +- tooling/test/testcases/js_watch_other_type_test.h | 2 +- tooling/test/testcases/js_watch_set_type_test.h | 2 +- tooling/test/testcases/js_watch_test.h | 2 +- tooling/test/testcases/js_watch_variable_test.h | 2 +- 72 files changed, 72 insertions(+), 73 deletions(-) diff --git a/tooling/test/BUILD.gn b/tooling/test/BUILD.gn index 9629de0e..46dd78d9 100644 --- a/tooling/test/BUILD.gn +++ b/tooling/test/BUILD.gn @@ -73,9 +73,8 @@ foreach(file, test_js_files) { if (file == "module_variable" || file == "export_variable_first" || file == "export_variable_second") { extra_args += [ "--module" ] - extra_args += [ "--merge-abc" ] } - + extra_args += [ "--merge-abc" ] in_puts = [ test_js ] out_puts = [ test_abc ] } diff --git a/tooling/test/testcases/js_accelerate_launch_test.h b/tooling/test/testcases/js_accelerate_launch_test.h index 45366e4a..f73f632d 100644 --- a/tooling/test/testcases/js_accelerate_launch_test.h +++ b/tooling/test/testcases/js_accelerate_launch_test.h @@ -119,7 +119,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsAccelerateLaunchTest() diff --git a/tooling/test/testcases/js_allocationtrack_loop_test.h b/tooling/test/testcases/js_allocationtrack_loop_test.h index 459ff1e3..d03802ec 100644 --- a/tooling/test/testcases/js_allocationtrack_loop_test.h +++ b/tooling/test/testcases/js_allocationtrack_loop_test.h @@ -205,7 +205,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsAllocationTrackLoopTest() diff --git a/tooling/test/testcases/js_allocationtrack_recursion_test.h b/tooling/test/testcases/js_allocationtrack_recursion_test.h index 1b51be79..7b6c3d8b 100644 --- a/tooling/test/testcases/js_allocationtrack_recursion_test.h +++ b/tooling/test/testcases/js_allocationtrack_recursion_test.h @@ -199,7 +199,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsAllocationTrackRecursionTest() diff --git a/tooling/test/testcases/js_allocationtrack_test.h b/tooling/test/testcases/js_allocationtrack_test.h index c0b1056e..4006309a 100755 --- a/tooling/test/testcases/js_allocationtrack_test.h +++ b/tooling/test/testcases/js_allocationtrack_test.h @@ -179,7 +179,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsAllocationtrackTest() diff --git a/tooling/test/testcases/js_breakpoint_arrow_test.h b/tooling/test/testcases/js_breakpoint_arrow_test.h index c1862297..757ec0be 100644 --- a/tooling/test/testcases/js_breakpoint_arrow_test.h +++ b/tooling/test/testcases/js_breakpoint_arrow_test.h @@ -87,7 +87,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "arrow_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "arrow_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "arrow_func"; }; std::unique_ptr GetJsBreakpointArrowTest() diff --git a/tooling/test/testcases/js_breakpoint_async_test.h b/tooling/test/testcases/js_breakpoint_async_test.h index d07584d0..1b033ec1 100644 --- a/tooling/test/testcases/js_breakpoint_async_test.h +++ b/tooling/test/testcases/js_breakpoint_async_test.h @@ -92,7 +92,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "async_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "async_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "async_func"; }; std::unique_ptr GetJsBreakpointAsyncTest() diff --git a/tooling/test/testcases/js_breakpoint_cannot_hit_test.h b/tooling/test/testcases/js_breakpoint_cannot_hit_test.h index 7b7f1011..6a384b79 100755 --- a/tooling/test/testcases/js_breakpoint_cannot_hit_test.h +++ b/tooling/test/testcases/js_breakpoint_cannot_hit_test.h @@ -103,7 +103,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "branch.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "branch.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "branch"; }; std::unique_ptr GetJsBreakpointCannotHitTest() diff --git a/tooling/test/testcases/js_breakpoint_in_different_branch.h b/tooling/test/testcases/js_breakpoint_in_different_branch.h index 95db3959..bb3f4c0e 100755 --- a/tooling/test/testcases/js_breakpoint_in_different_branch.h +++ b/tooling/test/testcases/js_breakpoint_in_different_branch.h @@ -98,7 +98,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "branch.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "branch.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "branch"; }; std::unique_ptr GetJsBreakpointInDifferentBranchTest() diff --git a/tooling/test/testcases/js_breakpoint_loop_test.h b/tooling/test/testcases/js_breakpoint_loop_test.h index 5c3fb07b..03f87e8d 100644 --- a/tooling/test/testcases/js_breakpoint_loop_test.h +++ b/tooling/test/testcases/js_breakpoint_loop_test.h @@ -156,7 +156,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsBreakpointLoopTest() diff --git a/tooling/test/testcases/js_breakpoint_recursion_test.h b/tooling/test/testcases/js_breakpoint_recursion_test.h index 5be03feb..45c269e5 100644 --- a/tooling/test/testcases/js_breakpoint_recursion_test.h +++ b/tooling/test/testcases/js_breakpoint_recursion_test.h @@ -132,7 +132,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsBreakpointRecursionTest() diff --git a/tooling/test/testcases/js_breakpoint_switch_test.h b/tooling/test/testcases/js_breakpoint_switch_test.h index 66a667c6..2fbcfa88 100644 --- a/tooling/test/testcases/js_breakpoint_switch_test.h +++ b/tooling/test/testcases/js_breakpoint_switch_test.h @@ -134,7 +134,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsBreakpointSwitchTest() diff --git a/tooling/test/testcases/js_breakpoint_test.h b/tooling/test/testcases/js_breakpoint_test.h index 2cee6c01..219a6705 100644 --- a/tooling/test/testcases/js_breakpoint_test.h +++ b/tooling/test/testcases/js_breakpoint_test.h @@ -92,7 +92,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsBreakpointTest() diff --git a/tooling/test/testcases/js_closure_scope_test.h b/tooling/test/testcases/js_closure_scope_test.h index b4d6fa4c..7ba2706b 100644 --- a/tooling/test/testcases/js_closure_scope_test.h +++ b/tooling/test/testcases/js_closure_scope_test.h @@ -337,7 +337,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "closure_scope.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "closure_scope.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "closure_scope"; }; std::unique_ptr GetJsClosureScopeTest() diff --git a/tooling/test/testcases/js_container_test.h b/tooling/test/testcases/js_container_test.h index 9b521de4..4d71bb84 100644 --- a/tooling/test/testcases/js_container_test.h +++ b/tooling/test/testcases/js_container_test.h @@ -160,7 +160,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "container.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "container.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "container"; const std::map> variableMap_ = { { "nop", { "undefined" } }, diff --git a/tooling/test/testcases/js_cpuprofile_async_test.h b/tooling/test/testcases/js_cpuprofile_async_test.h index c1fb48a9..ab05794c 100755 --- a/tooling/test/testcases/js_cpuprofile_async_test.h +++ b/tooling/test/testcases/js_cpuprofile_async_test.h @@ -97,7 +97,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "async_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "async_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "async_func"; }; std::unique_ptr GetJsCpuprofileAsyncTest() diff --git a/tooling/test/testcases/js_cpuprofile_loop_test.h b/tooling/test/testcases/js_cpuprofile_loop_test.h index f837cd65..2cddcdbb 100644 --- a/tooling/test/testcases/js_cpuprofile_loop_test.h +++ b/tooling/test/testcases/js_cpuprofile_loop_test.h @@ -112,7 +112,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsCpuprofileLoopTest() diff --git a/tooling/test/testcases/js_cpuprofile_recursion_test.h b/tooling/test/testcases/js_cpuprofile_recursion_test.h index a09a13db..d2cfd3c1 100644 --- a/tooling/test/testcases/js_cpuprofile_recursion_test.h +++ b/tooling/test/testcases/js_cpuprofile_recursion_test.h @@ -108,7 +108,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsCpuprofileRecursionTest() diff --git a/tooling/test/testcases/js_cpuprofile_step_test.h b/tooling/test/testcases/js_cpuprofile_step_test.h index 199d3f1e..126ddf82 100755 --- a/tooling/test/testcases/js_cpuprofile_step_test.h +++ b/tooling/test/testcases/js_cpuprofile_step_test.h @@ -115,7 +115,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsCpuprofileStepTest() diff --git a/tooling/test/testcases/js_cpuprofile_test.h b/tooling/test/testcases/js_cpuprofile_test.h index 9f99b793..cf492e1d 100755 --- a/tooling/test/testcases/js_cpuprofile_test.h +++ b/tooling/test/testcases/js_cpuprofile_test.h @@ -95,7 +95,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsCpuprofileTest() diff --git a/tooling/test/testcases/js_dropframe_test.h b/tooling/test/testcases/js_dropframe_test.h index fb2a5983..ac84cea6 100644 --- a/tooling/test/testcases/js_dropframe_test.h +++ b/tooling/test/testcases/js_dropframe_test.h @@ -307,7 +307,7 @@ private: std::string pandaFile_ = DEBUGGER_ABC_DIR "dropframe.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "dropframe.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "dropframe"; size_t breakpointCounter_ = 0; size_t dropframeCounter_ = 0; bool dropFrameChecked_ = false; diff --git a/tooling/test/testcases/js_exception_test.h b/tooling/test/testcases/js_exception_test.h index c7d8f498..ac64be7e 100644 --- a/tooling/test/testcases/js_exception_test.h +++ b/tooling/test/testcases/js_exception_test.h @@ -202,7 +202,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "exception.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "exception.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "exception"; }; std::unique_ptr GetJsExceptionTest() diff --git a/tooling/test/testcases/js_heapdump_loop_test.h b/tooling/test/testcases/js_heapdump_loop_test.h index 3ff047b1..6dc4e2a6 100644 --- a/tooling/test/testcases/js_heapdump_loop_test.h +++ b/tooling/test/testcases/js_heapdump_loop_test.h @@ -199,7 +199,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsHeapdumpLoopTest() diff --git a/tooling/test/testcases/js_heapdump_test.h b/tooling/test/testcases/js_heapdump_test.h index c1c13d6e..abfbc0a2 100755 --- a/tooling/test/testcases/js_heapdump_test.h +++ b/tooling/test/testcases/js_heapdump_test.h @@ -169,7 +169,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsHeapdumpTest() diff --git a/tooling/test/testcases/js_heapprofiler_dump_test.h b/tooling/test/testcases/js_heapprofiler_dump_test.h index bd16a6df..09331699 100644 --- a/tooling/test/testcases/js_heapprofiler_dump_test.h +++ b/tooling/test/testcases/js_heapprofiler_dump_test.h @@ -115,7 +115,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsHeapProfilerDumpTest() diff --git a/tooling/test/testcases/js_heapsampling_loop_test.h b/tooling/test/testcases/js_heapsampling_loop_test.h index 036f5d77..3d37e3eb 100644 --- a/tooling/test/testcases/js_heapsampling_loop_test.h +++ b/tooling/test/testcases/js_heapsampling_loop_test.h @@ -110,7 +110,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsHeapSamplingLoopTest() diff --git a/tooling/test/testcases/js_heapsampling_test.h b/tooling/test/testcases/js_heapsampling_test.h index d9a2820b..0ef339af 100644 --- a/tooling/test/testcases/js_heapsampling_test.h +++ b/tooling/test/testcases/js_heapsampling_test.h @@ -97,7 +97,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsHeapsamplingTest() diff --git a/tooling/test/testcases/js_heapusage_async_test.h b/tooling/test/testcases/js_heapusage_async_test.h index 463638b0..208a6688 100755 --- a/tooling/test/testcases/js_heapusage_async_test.h +++ b/tooling/test/testcases/js_heapusage_async_test.h @@ -103,7 +103,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "async_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "async_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "async_func"; }; std::unique_ptr GetJsHeapusageAsyncTest() diff --git a/tooling/test/testcases/js_heapusage_loop_test.h b/tooling/test/testcases/js_heapusage_loop_test.h index a0a5b7e1..221df178 100644 --- a/tooling/test/testcases/js_heapusage_loop_test.h +++ b/tooling/test/testcases/js_heapusage_loop_test.h @@ -108,7 +108,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsHeapusageLoopTest() diff --git a/tooling/test/testcases/js_heapusage_recursion_test.h b/tooling/test/testcases/js_heapusage_recursion_test.h index f9baf606..7930f49c 100644 --- a/tooling/test/testcases/js_heapusage_recursion_test.h +++ b/tooling/test/testcases/js_heapusage_recursion_test.h @@ -108,7 +108,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsHeapusageRecursionTest() diff --git a/tooling/test/testcases/js_heapusage_step_test.h b/tooling/test/testcases/js_heapusage_step_test.h index f9b36a96..698d3e5a 100755 --- a/tooling/test/testcases/js_heapusage_step_test.h +++ b/tooling/test/testcases/js_heapusage_step_test.h @@ -132,7 +132,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsHeapusageStepTest() diff --git a/tooling/test/testcases/js_heapusage_test.h b/tooling/test/testcases/js_heapusage_test.h index 4fb0a66f..542c9c58 100755 --- a/tooling/test/testcases/js_heapusage_test.h +++ b/tooling/test/testcases/js_heapusage_test.h @@ -124,7 +124,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsHeapusageTest() diff --git a/tooling/test/testcases/js_local_variable_scope_test.h b/tooling/test/testcases/js_local_variable_scope_test.h index db18da7f..4f7187be 100644 --- a/tooling/test/testcases/js_local_variable_scope_test.h +++ b/tooling/test/testcases/js_local_variable_scope_test.h @@ -133,7 +133,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "local_variable_scope.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "local_variable_scope.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "local_variable_scope"; std::map truthGroundMap_ = { {"a", "1"}, diff --git a/tooling/test/testcases/js_multiple_breakpoint_in_function_test.h b/tooling/test/testcases/js_multiple_breakpoint_in_function_test.h index 178d9e65..eca5003e 100755 --- a/tooling/test/testcases/js_multiple_breakpoint_in_function_test.h +++ b/tooling/test/testcases/js_multiple_breakpoint_in_function_test.h @@ -131,7 +131,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "step.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "step.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "step"; }; std::unique_ptr GetJsMultipleBreakpointInFunctionTest() diff --git a/tooling/test/testcases/js_multiple_common_breakpoint_test.h b/tooling/test/testcases/js_multiple_common_breakpoint_test.h index 9416ffbd..0b8e8fba 100755 --- a/tooling/test/testcases/js_multiple_common_breakpoint_test.h +++ b/tooling/test/testcases/js_multiple_common_breakpoint_test.h @@ -123,7 +123,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "step.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "step.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "step"; }; std::unique_ptr GetJsMultipleCommonBreakpointTest() diff --git a/tooling/test/testcases/js_range_error_test.h b/tooling/test/testcases/js_range_error_test.h index 87dab135..ffe04511 100644 --- a/tooling/test/testcases/js_range_error_test.h +++ b/tooling/test/testcases/js_range_error_test.h @@ -97,7 +97,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "range_error.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "range_error.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "range_error"; JSPtLocation location_ {nullptr, JSPtLocation::EntityId(0), 0}; size_t breakpointCounter_ = 0; size_t exceptionCounter_ = 0; diff --git a/tooling/test/testcases/js_single_step_test.h b/tooling/test/testcases/js_single_step_test.h index ae22b71d..eaa10c94 100644 --- a/tooling/test/testcases/js_single_step_test.h +++ b/tooling/test/testcases/js_single_step_test.h @@ -86,7 +86,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; JSPtLocation locationStart_ {nullptr, JSPtLocation::EntityId(0), 0}; JSPtLocation locationEnd_ {nullptr, JSPtLocation::EntityId(0), 0}; JSPtLocation locationStep_ {nullptr, JSPtLocation::EntityId(0), 0}; diff --git a/tooling/test/testcases/js_smart_stepInto_test.h b/tooling/test/testcases/js_smart_stepInto_test.h index 9bf27bdc..5616afe9 100644 --- a/tooling/test/testcases/js_smart_stepInto_test.h +++ b/tooling/test/testcases/js_smart_stepInto_test.h @@ -149,7 +149,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "smart_stepInto.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "smart_stepInto.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "smart_stepInto"; }; std::unique_ptr GetJsSmartStepoutTest() { return std::make_unique(); } diff --git a/tooling/test/testcases/js_source_test.h b/tooling/test/testcases/js_source_test.h index 55c3c051..e02cf9bc 100644 --- a/tooling/test/testcases/js_source_test.h +++ b/tooling/test/testcases/js_source_test.h @@ -75,7 +75,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsSourceTest() diff --git a/tooling/test/testcases/js_special_location_breakpoint_test.h b/tooling/test/testcases/js_special_location_breakpoint_test.h index 95a8f8bb..373ba198 100755 --- a/tooling/test/testcases/js_special_location_breakpoint_test.h +++ b/tooling/test/testcases/js_special_location_breakpoint_test.h @@ -138,7 +138,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "step.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "step.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "step"; }; std::unique_ptr GetJsSpecialLocationBreakpointTest() diff --git a/tooling/test/testcases/js_step_into_test.h b/tooling/test/testcases/js_step_into_test.h index 0d50511d..358ba106 100644 --- a/tooling/test/testcases/js_step_into_test.h +++ b/tooling/test/testcases/js_step_into_test.h @@ -105,7 +105,7 @@ private: std::string pandaFile_ = DEBUGGER_ABC_DIR "step.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "step.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "step"; size_t breakpointCounter_ = 0; size_t stepCompleteCounter_ = 0; std::vector pointerLocations_; diff --git a/tooling/test/testcases/js_step_out_test.h b/tooling/test/testcases/js_step_out_test.h index cf96640e..a22506aa 100644 --- a/tooling/test/testcases/js_step_out_test.h +++ b/tooling/test/testcases/js_step_out_test.h @@ -99,7 +99,7 @@ private: std::string pandaFile_ = DEBUGGER_ABC_DIR "step.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "step.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "step"; JSPtLocation location1_ {nullptr, JSPtLocation::EntityId(0), 0}; JSPtLocation location2_ {nullptr, JSPtLocation::EntityId(0), 0}; size_t breakpointCounter_ = 0; diff --git a/tooling/test/testcases/js_step_over_test.h b/tooling/test/testcases/js_step_over_test.h index 1f6319d6..929ecc36 100644 --- a/tooling/test/testcases/js_step_over_test.h +++ b/tooling/test/testcases/js_step_over_test.h @@ -103,7 +103,7 @@ private: std::string pandaFile_ = DEBUGGER_ABC_DIR "step.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "step.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "step"; JSPtLocation location1_ {nullptr, JSPtLocation::EntityId(0), 0}; JSPtLocation location2_ {nullptr, JSPtLocation::EntityId(0), 0}; size_t breakpointCounter_ = 0; diff --git a/tooling/test/testcases/js_stepinto_and_stepout_test.h b/tooling/test/testcases/js_stepinto_and_stepout_test.h index b6fb9ead..ca3eaf1d 100755 --- a/tooling/test/testcases/js_stepinto_and_stepout_test.h +++ b/tooling/test/testcases/js_stepinto_and_stepout_test.h @@ -223,7 +223,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepintoAndStepoutTest() diff --git a/tooling/test/testcases/js_stepinto_arrow_test.h b/tooling/test/testcases/js_stepinto_arrow_test.h index 409f3479..cc813a51 100755 --- a/tooling/test/testcases/js_stepinto_arrow_test.h +++ b/tooling/test/testcases/js_stepinto_arrow_test.h @@ -234,7 +234,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "arrow_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "arrow_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "arrow_func"; }; std::unique_ptr GetJsStepintoArrowTest() diff --git a/tooling/test/testcases/js_stepinto_async_test.h b/tooling/test/testcases/js_stepinto_async_test.h index f2c94085..a0a68792 100755 --- a/tooling/test/testcases/js_stepinto_async_test.h +++ b/tooling/test/testcases/js_stepinto_async_test.h @@ -182,7 +182,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "async_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "async_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "async_func"; }; std::unique_ptr GetJsStepintoAsyncTest() diff --git a/tooling/test/testcases/js_stepinto_loop_test.h b/tooling/test/testcases/js_stepinto_loop_test.h index 2bdbc908..0aff1fb2 100644 --- a/tooling/test/testcases/js_stepinto_loop_test.h +++ b/tooling/test/testcases/js_stepinto_loop_test.h @@ -216,7 +216,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepintoLoopTest() diff --git a/tooling/test/testcases/js_stepinto_recursion_test.h b/tooling/test/testcases/js_stepinto_recursion_test.h index cf54138b..d3cebe6a 100644 --- a/tooling/test/testcases/js_stepinto_recursion_test.h +++ b/tooling/test/testcases/js_stepinto_recursion_test.h @@ -180,7 +180,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepintoRecursionTest() diff --git a/tooling/test/testcases/js_stepinto_switch_test.h b/tooling/test/testcases/js_stepinto_switch_test.h index eb42d154..be4f1cf6 100644 --- a/tooling/test/testcases/js_stepinto_switch_test.h +++ b/tooling/test/testcases/js_stepinto_switch_test.h @@ -185,7 +185,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepintoSwitchTest() diff --git a/tooling/test/testcases/js_stepinto_test.h b/tooling/test/testcases/js_stepinto_test.h index c0cbd451..a0f1caf4 100755 --- a/tooling/test/testcases/js_stepinto_test.h +++ b/tooling/test/testcases/js_stepinto_test.h @@ -221,7 +221,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepintoTest() diff --git a/tooling/test/testcases/js_stepout_arrow_test.h b/tooling/test/testcases/js_stepout_arrow_test.h index 1af9d602..f487f896 100755 --- a/tooling/test/testcases/js_stepout_arrow_test.h +++ b/tooling/test/testcases/js_stepout_arrow_test.h @@ -204,7 +204,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "arrow_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "arrow_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "arrow_func"; }; std::unique_ptr GetJsStepoutArrowTest() diff --git a/tooling/test/testcases/js_stepout_async_test.h b/tooling/test/testcases/js_stepout_async_test.h index cdb1d906..665435cb 100755 --- a/tooling/test/testcases/js_stepout_async_test.h +++ b/tooling/test/testcases/js_stepout_async_test.h @@ -152,7 +152,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "async_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "async_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "async_func"; }; std::unique_ptr GetJsStepoutAsyncTest() diff --git a/tooling/test/testcases/js_stepout_before_function_test.h b/tooling/test/testcases/js_stepout_before_function_test.h index 6e0962d5..6056cde3 100755 --- a/tooling/test/testcases/js_stepout_before_function_test.h +++ b/tooling/test/testcases/js_stepout_before_function_test.h @@ -158,7 +158,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoutBeforeFunctionTest() diff --git a/tooling/test/testcases/js_stepout_loop_test.h b/tooling/test/testcases/js_stepout_loop_test.h index 9471824a..9953a9cd 100644 --- a/tooling/test/testcases/js_stepout_loop_test.h +++ b/tooling/test/testcases/js_stepout_loop_test.h @@ -155,7 +155,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoutLoopTest() diff --git a/tooling/test/testcases/js_stepout_recursion_test.h b/tooling/test/testcases/js_stepout_recursion_test.h index 52f53826..49b77151 100644 --- a/tooling/test/testcases/js_stepout_recursion_test.h +++ b/tooling/test/testcases/js_stepout_recursion_test.h @@ -127,7 +127,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoutRecursionTest() diff --git a/tooling/test/testcases/js_stepout_switch_test.h b/tooling/test/testcases/js_stepout_switch_test.h index 2b05ea63..98c73583 100644 --- a/tooling/test/testcases/js_stepout_switch_test.h +++ b/tooling/test/testcases/js_stepout_switch_test.h @@ -139,7 +139,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoutSwitchTest() diff --git a/tooling/test/testcases/js_stepout_test.h b/tooling/test/testcases/js_stepout_test.h index bdd570d1..c21d7e2f 100755 --- a/tooling/test/testcases/js_stepout_test.h +++ b/tooling/test/testcases/js_stepout_test.h @@ -153,7 +153,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoutTest() diff --git a/tooling/test/testcases/js_stepover_loop_test.h b/tooling/test/testcases/js_stepover_loop_test.h index c050024d..f5bf6006 100644 --- a/tooling/test/testcases/js_stepover_loop_test.h +++ b/tooling/test/testcases/js_stepover_loop_test.h @@ -216,7 +216,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoverLoopTest() diff --git a/tooling/test/testcases/js_stepover_recursion_test.h b/tooling/test/testcases/js_stepover_recursion_test.h index 45070094..ace2cd33 100644 --- a/tooling/test/testcases/js_stepover_recursion_test.h +++ b/tooling/test/testcases/js_stepover_recursion_test.h @@ -155,7 +155,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoverRecursionTest() diff --git a/tooling/test/testcases/js_stepover_switch_test.h b/tooling/test/testcases/js_stepover_switch_test.h index af2e03e6..78731100 100644 --- a/tooling/test/testcases/js_stepover_switch_test.h +++ b/tooling/test/testcases/js_stepover_switch_test.h @@ -185,7 +185,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoverSwitchTest() diff --git a/tooling/test/testcases/js_stepover_test.h b/tooling/test/testcases/js_stepover_test.h index 26a2c472..a5eaf15e 100755 --- a/tooling/test/testcases/js_stepover_test.h +++ b/tooling/test/testcases/js_stepover_test.h @@ -158,7 +158,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "common_func.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "common_func.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "common_func"; }; std::unique_ptr GetJsStepoverTest() diff --git a/tooling/test/testcases/js_syntax_exception_test.h b/tooling/test/testcases/js_syntax_exception_test.h index b0b35a05..905ab228 100644 --- a/tooling/test/testcases/js_syntax_exception_test.h +++ b/tooling/test/testcases/js_syntax_exception_test.h @@ -98,7 +98,7 @@ private: const std::string testFile = "syntax_exception"; std::string pandaFile_ = DEBUGGER_ABC_DIR + testFile + ".abc"; std::string sourceFile_ = DEBUGGER_JS_DIR + testFile + ".js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = testFile; JSPtLocation location_ {nullptr, JSPtLocation::EntityId(0), 0}; size_t breakpointCounter_ = 0; size_t exceptionCounter_ = 0; diff --git a/tooling/test/testcases/js_throw_exception_test.h b/tooling/test/testcases/js_throw_exception_test.h index 2ab925d1..b081bb91 100644 --- a/tooling/test/testcases/js_throw_exception_test.h +++ b/tooling/test/testcases/js_throw_exception_test.h @@ -101,7 +101,7 @@ private: const std::string testFile = "throw_exception"; std::string pandaFile_ = DEBUGGER_ABC_DIR + testFile + ".abc"; std::string sourceFile_ = DEBUGGER_JS_DIR + testFile + ".js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = testFile; JSPtLocation location_ {nullptr, JSPtLocation::EntityId(0), 0}; size_t breakpointCounter_ = 0; size_t exceptionCounter_ = 0; diff --git a/tooling/test/testcases/js_tracing_test.h b/tooling/test/testcases/js_tracing_test.h index 270b1d54..2b21a273 100644 --- a/tooling/test/testcases/js_tracing_test.h +++ b/tooling/test/testcases/js_tracing_test.h @@ -80,7 +80,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsTracingTest() diff --git a/tooling/test/testcases/js_variable_first_test.h b/tooling/test/testcases/js_variable_first_test.h index 51fda330..8eca4c49 100644 --- a/tooling/test/testcases/js_variable_first_test.h +++ b/tooling/test/testcases/js_variable_first_test.h @@ -829,7 +829,7 @@ private: RuntimeImpl *runtime_ {nullptr}; }; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "variable_first"; JSPtLocation location_ {nullptr, JSPtLocation::EntityId(0), 0}; size_t breakpointCounter_ = 0; }; diff --git a/tooling/test/testcases/js_variable_second_test.h b/tooling/test/testcases/js_variable_second_test.h index 8f921b57..66073c0b 100644 --- a/tooling/test/testcases/js_variable_second_test.h +++ b/tooling/test/testcases/js_variable_second_test.h @@ -417,7 +417,7 @@ private: RuntimeImpl *runtime_ {nullptr}; }; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "variable_second"; JSPtLocation location_ {nullptr, JSPtLocation::EntityId(0), 0}; size_t breakpointCounter_ = 0; }; diff --git a/tooling/test/testcases/js_watch_basic_type_test.h b/tooling/test/testcases/js_watch_basic_type_test.h index 775136d8..ff453b6c 100644 --- a/tooling/test/testcases/js_watch_basic_type_test.h +++ b/tooling/test/testcases/js_watch_basic_type_test.h @@ -194,7 +194,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "watch_variable.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "watch_variable.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "watch_variable"; }; std::unique_ptr GetJsWatchBasicTypeTest() diff --git a/tooling/test/testcases/js_watch_closure_variable_test.h b/tooling/test/testcases/js_watch_closure_variable_test.h index 83584c06..56d7e0dc 100644 --- a/tooling/test/testcases/js_watch_closure_variable_test.h +++ b/tooling/test/testcases/js_watch_closure_variable_test.h @@ -145,7 +145,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "closure_variable.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "closure_variable.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "closure_variable"; }; std::unique_ptr GetJsWatchClosureVariableTest() diff --git a/tooling/test/testcases/js_watch_other_type_test.h b/tooling/test/testcases/js_watch_other_type_test.h index 8303dbea..0fd734e9 100644 --- a/tooling/test/testcases/js_watch_other_type_test.h +++ b/tooling/test/testcases/js_watch_other_type_test.h @@ -201,7 +201,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "watch_variable.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "watch_variable.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "watch_variable"; }; std::unique_ptr GetJsWatchOtherTypeTest() diff --git a/tooling/test/testcases/js_watch_set_type_test.h b/tooling/test/testcases/js_watch_set_type_test.h index 8ee1893c..0ca66a21 100644 --- a/tooling/test/testcases/js_watch_set_type_test.h +++ b/tooling/test/testcases/js_watch_set_type_test.h @@ -307,7 +307,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "watch_variable.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "watch_variable.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "watch_variable"; }; std::unique_ptr GetJsWatchSetTypeTest() diff --git a/tooling/test/testcases/js_watch_test.h b/tooling/test/testcases/js_watch_test.h index 117c0325..a5fa7d15 100644 --- a/tooling/test/testcases/js_watch_test.h +++ b/tooling/test/testcases/js_watch_test.h @@ -224,7 +224,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "sample.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "sample.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "sample"; }; std::unique_ptr GetJsWatchTest() diff --git a/tooling/test/testcases/js_watch_variable_test.h b/tooling/test/testcases/js_watch_variable_test.h index 200669c2..61013e4c 100755 --- a/tooling/test/testcases/js_watch_variable_test.h +++ b/tooling/test/testcases/js_watch_variable_test.h @@ -185,7 +185,7 @@ public: private: std::string pandaFile_ = DEBUGGER_ABC_DIR "step.abc"; std::string sourceFile_ = DEBUGGER_JS_DIR "step.js"; - std::string entryPoint_ = "_GLOBAL::func_main_0"; + std::string entryPoint_ = "step"; }; std::unique_ptr GetJsWatchVariableTest() -- Gitee From 0f145c8dcadf0f6d2d17b367b5ac95ff18e250d9 Mon Sep 17 00:00:00 2001 From: yanzhiqi1 Date: Thu, 20 Mar 2025 14:57:28 +0800 Subject: [PATCH 3/9] Adapt to fdsan Issue: #IBTKHJ Signed-off-by: yanzhiqi1 --- tooling/client/tcpServer/tcp_server.cpp | 11 +++++++++++ websocket/server/websocket_server.cpp | 14 ++++++++++++++ websocket/websocket_base.cpp | 11 +++++++++++ 3 files changed, 36 insertions(+) diff --git a/tooling/client/tcpServer/tcp_server.cpp b/tooling/client/tcpServer/tcp_server.cpp index 6db38292..b9083229 100644 --- a/tooling/client/tcpServer/tcp_server.cpp +++ b/tooling/client/tcpServer/tcp_server.cpp @@ -62,6 +62,9 @@ void TcpServer::ServerConnect() CloseServer(); return; } +#if defined(PANDA_TARGET_OHOS) + fdsan_exchange_owner_tag(lfd, 0, LOG_DOMAIN); +#endif int ret = bind(lfd, (struct sockaddr*)&saddr, sizeof(saddr)); if (ret == -1) { @@ -85,6 +88,9 @@ void TcpServer::ServerConnect() CloseServer(); return; } +#if defined(PANDA_TARGET_OHOS) + fdsan_exchange_owner_tag(cfd, 0, LOG_DOMAIN); +#endif } void TcpServer::SendCommand(std::string inputStr) @@ -137,8 +143,13 @@ void TcpServer::StartTcpServer([[maybe_unused]] void* arg) } } while (num > 0); +#if defined(PANDA_TARGET_OHOS) + fdsan_close_with_tag(cfd, LOG_DOMAIN); + fdsan_close_with_tag(lfd, LOG_DOMAIN); +#else close(cfd); close(lfd); +#endif CloseServer(); return; diff --git a/websocket/server/websocket_server.cpp b/websocket/server/websocket_server.cpp index 7ce0e08d..48bc97ac 100644 --- a/websocket/server/websocket_server.cpp +++ b/websocket/server/websocket_server.cpp @@ -44,7 +44,11 @@ WebSocketServer::~WebSocketServer() noexcept { if (serverFd_ != -1) { LOGW("WebSocket server is closed while destructing the object"); +#if defined(PANDA_TARGET_OHOS) + fdsan_close_with_tag(serverFd_, LOG_DOMAIN); +#else close(serverFd_); +#endif // Reset directly in order to prevent static analyzer warnings. serverFd_ = -1; } @@ -235,6 +239,9 @@ bool WebSocketServer::InitTcpWebSocket(int port, uint32_t timeoutLimit) LOGE("InitTcpWebSocket socket init failed, errno = %{public}d", errno); return false; } +#if defined(PANDA_TARGET_OHOS) + fdsan_exchange_owner_tag(serverFd_, 0, LOG_DOMAIN); +#endif // allow specified port can be used at once and not wait TIME_WAIT status ending int sockOptVal = 1; if ((setsockopt(serverFd_, SOL_SOCKET, SO_REUSEADDR, @@ -282,6 +289,9 @@ bool WebSocketServer::InitUnixWebSocket(const std::string& sockName, uint32_t ti LOGE("InitUnixWebSocket socket init failed, errno = %{public}d", errno); return false; } +#if defined(PANDA_TARGET_OHOS) + fdsan_exchange_owner_tag(serverFd_, 0, LOG_DOMAIN); +#endif // set send and recv timeout if (!SetWebSocketTimeOut(serverFd_, timeoutLimit)) { LOGE("InitUnixWebSocket SetWebSocketTimeOut failed"); @@ -363,7 +373,11 @@ bool WebSocketServer::ConnectUnixWebSocketBySocketpair() void WebSocketServer::CloseServerSocket() { +#if defined(PANDA_TARGET_OHOS) + fdsan_close_with_tag(serverFd_, LOG_DOMAIN); +#else close(serverFd_); +#endif serverFd_ = -1; } diff --git a/websocket/websocket_base.cpp b/websocket/websocket_base.cpp index e9f4cac0..90cb0a58 100644 --- a/websocket/websocket_base.cpp +++ b/websocket/websocket_base.cpp @@ -36,7 +36,11 @@ WebSocketBase::~WebSocketBase() noexcept { if (connectionFd_ != -1) { LOGW("WebSocket connection is closed while destructing the object"); +#if defined(PANDA_TARGET_OHOS) + fdsan_close_with_tag(connectionFd_, LOG_DOMAIN); +#else close(connectionFd_); +#endif // Reset directly in order to prevent static analyzer warnings. connectionFd_ = -1; } @@ -208,7 +212,11 @@ void WebSocketBase::CloseConnectionSocket(ConnectionCloseReason status) // Note that `close` must be also done in critical section, // otherwise the other thread can continue using the outdated and possibly reassigned file descriptor. std::unique_lock lock(connectionMutex_); +#if defined(PANDA_TARGET_OHOS) + fdsan_close_with_tag(connectionFd_, LOG_DOMAIN); +#else close(connectionFd_); +#endif // Reset directly in order to prevent static analyzer warnings. connectionFd_ = -1; } @@ -257,6 +265,9 @@ int WebSocketBase::GetConnectionSocket() const void WebSocketBase::SetConnectionSocket(int socketFd) { +#if defined(PANDA_TARGET_OHOS) + fdsan_exchange_owner_tag(socketFd, 0, LOG_DOMAIN); +#endif connectionFd_ = socketFd; } -- Gitee From 3d810b91f473d975e146196882f19b68a4588cb1 Mon Sep 17 00:00:00 2001 From: hanlong Date: Tue, 25 Mar 2025 20:20:54 +0800 Subject: [PATCH 4/9] Update KFl Issue:https://gitee.com/openharmony/arkcompiler_toolchain/issues/IBW8VT?from=project-issue Signed-off-by: hanlong --- test/ut/ignore-ut-release-qemu-toolchain.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut/ignore-ut-release-qemu-toolchain.txt b/test/ut/ignore-ut-release-qemu-toolchain.txt index 835394a7..4261348a 100644 --- a/test/ut/ignore-ut-release-qemu-toolchain.txt +++ b/test/ut/ignore-ut-release-qemu-toolchain.txt @@ -1,2 +1,2 @@ -# Known failure list for ut - release - qemu - toolchain - +#24285 +test/test/libjsdebugtest.so -- Gitee From 1da47a18b3b67071fe60e89f5bd042487003d49c Mon Sep 17 00:00:00 2001 From: yang-19970325 Date: Tue, 4 Mar 2025 17:32:57 +0800 Subject: [PATCH 5/9] Add async stack Issue: #IBQO8S Signed-off-by: yang-19970325 --- test/resource/tooling/ohos_test.xml | 4 + tooling/agent/debugger_impl.cpp | 117 +++++++- tooling/agent/debugger_impl.h | 5 +- tooling/backend/js_pt_hooks.cpp | 7 + tooling/backend/js_pt_hooks.h | 1 + tooling/base/pt_events.cpp | 47 +++- tooling/base/pt_events.h | 26 ++ tooling/client/domain/debugger_client.cpp | 22 ++ tooling/client/domain/debugger_client.h | 1 + tooling/client/utils/cli_command.cpp | 4 + tooling/test/BUILD.gn | 1 + tooling/test/client_utils/test_list.cpp | 2 + tooling/test/debugger_impl_test.cpp | 7 +- tooling/test/testcases/js/promise.js | 77 ++++++ tooling/test/testcases/js_asyn_stack_test.h | 292 ++++++++++++++++++++ tooling/test/utils/test_hooks.h | 3 + 16 files changed, 601 insertions(+), 15 deletions(-) create mode 100644 tooling/test/testcases/js/promise.js create mode 100644 tooling/test/testcases/js_asyn_stack_test.h diff --git a/test/resource/tooling/ohos_test.xml b/test/resource/tooling/ohos_test.xml index b26b1407..b78bc478 100755 --- a/test/resource/tooling/ohos_test.xml +++ b/test/resource/tooling/ohos_test.xml @@ -36,6 +36,7 @@