Merge branch 'master' of https://gitee.com/wulisun/resourceschedule_soc_perf_3

services/BUILD.gn

@@ -17,6 +17,7 @@ import("../soc_perf.gni")
 config("socperf_server_config") {
   include_dirs = [
     "core/include",
+    "dfx/include",
     "server/include",
     "${socperf_common}/include",
     "${socperf_interfaces}/inner_api/socperf_client/include",

services/dfx/include/socperf_hitrace_chain.h

@@ -16,7 +16,7 @@
 #ifndef SOCPERF_HITRACE_CHAIN_H
 #define SOCPERF_HITRACE_CHAIN_H
 
-#include "hitracechainc.h"
+#include "hitracechain.h"
 
 namespace OHOS {
 namespace SOCPERF {

test/unittest/BUILD.gn

@@ -23,6 +23,7 @@ config("module_private_config") {
     "${socperf_common}/include",
     "${socperf_interfaces}/inner_api/socperf_client/include",
     "${socperf_services}/core/include",
+    "${socperf_services}/dfx/include",
     "${socperf_services}/server/include",
   ]
 }
@@ -35,7 +36,7 @@ ohos_unittest("SocPerfHitraceChainTest") {
 
   configs = [ ":module_private_config" ]
 
-  deps = [ "${socperf_interfaces}/inner_api/socperf_client:socperf_client" ]
+  deps = [ "${socperf_services}:socperf_server_static" ]
 
   external_deps = [
     "googletest:gtest_main",
@@ -73,6 +74,7 @@ ohos_unittest("SocPerfServerTest") {
     "c_utils:utils",
     "ffrt:libffrt",
     "hilog:libhilog",
+    "hitrace:libhitracechain",
     "ipc:ipc_single",
     "libxml2:libxml2",
     "safwk:system_ability_fwk",

test/unittest/dfx/socperf_hitrace_chain_test.cpp

@@ -20,7 +20,6 @@
 #include "socperf_hitrace_chain.h"
 
 using namespace testing::ext;
-using namespace testing::mt;
 
 namespace OHOS {
 namespace SOCPERF {