已合并
[Profiling]修复--application参数错误把-m识别成路径，命令解析失败问题 #512
zhengkai创建于 18 天前
[Profiling]修复--application参数错误把-m识别成路径，命令解析失败问题 #512
已合并
共 3 个文件变更+0-42
| @@ -57,20 +57,6 @@ int32_t Application::PrepareLaunchAppCmd(std::stringstream &ssCmdApp, | |||
| 57 | return PROFILING_SUCCESS; | 57 | return PROFILING_SUCCESS; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | -std::string Application::GetAppPath(std::vector<std::string> paramsCmd) | ||
| 61 | -{ | ||
| 62 | - if (paramsCmd.empty()) { | ||
| 63 | - return ""; | ||
| 64 | - } | ||
| 65 | - std::string ret = ""; | ||
| 66 | - if (analysis::dvvp::common::utils::Utils::IsAppName(paramsCmd[0])) { | ||
| 67 | - ret = paramsCmd[0]; | ||
| 68 | - } else if (paramsCmd.size() > 1) { | ||
| 69 | - ret = paramsCmd[1]; | ||
| 70 | - } | ||
| 71 | - return ret; | ||
| 72 | -} | ||
| 73 | - | ||
| 74 | std::string Application::GetCmdString(const std::string paramsName) | 60 | std::string Application::GetCmdString(const std::string paramsName) |
| 75 | { | 61 | { |
| 76 | if (paramsName.empty()) { | 62 | if (paramsName.empty()) { |
| @@ -125,15 +111,6 @@ int32_t Application::ResolveAppCmd(SHARED_PTR_ALIA<analysis::dvvp::message::Prof | |||
| 125 | MSPROF_LOGE("[LaunchApp]paramsCmd is empty."); | 111 | MSPROF_LOGE("[LaunchApp]paramsCmd is empty."); |
| 126 | return PROFILING_FAILED; | 112 | return PROFILING_FAILED; |
| 127 | } | 113 | } |
| 128 | - std::string appPath = GetAppPath(paramsCmd); | ||
| 129 | - if (appPath.empty()) { | ||
| 130 | - MSPROF_LOGE("app_dir is empty."); | ||
| 131 | - return PROFILING_FAILED; | ||
| 132 | - } | ||
| 133 | - if (analysis::dvvp::common::utils::Utils::IsSoftLink(appPath)) { | ||
| 134 | - MSPROF_LOGE("app_dir(%s) is soft link.", Utils::BaseName(appPath).c_str()); | ||
| 135 | - return PROFILING_FAILED; | ||
| 136 | - } | ||
| 137 | cmd = GetCmdString(paramsCmd[0]); | 114 | cmd = GetCmdString(paramsCmd[0]); |
| 138 | if (cmd.empty()) { | 115 | if (cmd.empty()) { |
| 139 | MSPROF_LOGE("app_dir(%s) is not valid.", Utils::BaseName(paramsCmd[0]).c_str()); | 116 | MSPROF_LOGE("app_dir(%s) is not valid.", Utils::BaseName(paramsCmd[0]).c_str()); |
| @@ -48,7 +48,6 @@ private: | |||
| 48 | static void SetAppEnv(SHARED_PTR_ALIA<analysis::dvvp::message::ProfileParams> params, | 48 | static void SetAppEnv(SHARED_PTR_ALIA<analysis::dvvp::message::ProfileParams> params, |
| 49 | std::vector<std::string> &envsV); | 49 | std::vector<std::string> &envsV); |
| 50 | static void SourceEnv(std::vector<std::string> &argsVec); | 50 | static void SourceEnv(std::vector<std::string> &argsVec); |
| 51 | - static std::string GetAppPath(std::vector<std::string> paramsCmd); | ||
| 52 | static std::string GetCmdString(const std::string paramsName); | 51 | static std::string GetCmdString(const std::string paramsName); |
| 53 | }; | 52 | }; |
| 54 | } // namespace app | 53 | } // namespace app |
| @@ -169,10 +169,6 @@ TEST_F(PROF_APPLICATION_TEST, LaunchApp) { | |||
| 169 | .stubs() | 169 | .stubs() |
| 170 | .will(returnValue(true)); | 170 | .will(returnValue(true)); |
| 171 | 171 | ||
| 172 | - MOCKER(analysis::dvvp::common::utils::Utils::IsSoftLink) | ||
| 173 | - .stubs() | ||
| 174 | - .will(returnValue(false)); | ||
| 175 | - | ||
| 176 | EXPECT_EQ(PROFILING_FAILED, analysis::dvvp::app::Application::LaunchApp(nullptr, app_process)); | 172 | EXPECT_EQ(PROFILING_FAILED, analysis::dvvp::app::Application::LaunchApp(nullptr, app_process)); |
| 177 | EXPECT_EQ(PROFILING_FAILED, analysis::dvvp::app::Application::LaunchApp(params, app_process)); | 173 | EXPECT_EQ(PROFILING_FAILED, analysis::dvvp::app::Application::LaunchApp(params, app_process)); |
| 178 | 174 | ||
| @@ -230,20 +226,6 @@ TEST_F(PROF_APPLICATION_TEST, SetGlobalEnv) { | |||
| 230 | } | 226 | } |
| 231 | } | 227 | } |
| 232 | 228 | ||
| 233 | -TEST_F(PROF_APPLICATION_TEST, GetAppPath) { | ||
| 234 | - GlobalMockObject::verify(); | ||
| 235 | - std::vector<std::string> paramsCmd; | ||
| 236 | - EXPECT_EQ("", analysis::dvvp::app::Application::GetAppPath(paramsCmd)); | ||
| 237 | - | ||
| 238 | - paramsCmd.push_back("first"); | ||
| 239 | - paramsCmd.push_back("second"); | ||
| 240 | - paramsCmd.push_back("third"); | ||
| 241 | - EXPECT_EQ("first", analysis::dvvp::app::Application::GetAppPath(paramsCmd)); | ||
| 242 | - | ||
| 243 | - paramsCmd[0] = "bash"; | ||
| 244 | - EXPECT_EQ("second", analysis::dvvp::app::Application::GetAppPath(paramsCmd)); | ||
| 245 | -} | ||
| 246 | - | ||
| 247 | TEST_F(PROF_APPLICATION_TEST, GetCmdString) { | 229 | TEST_F(PROF_APPLICATION_TEST, GetCmdString) { |
| 248 | GlobalMockObject::verify(); | 230 | GlobalMockObject::verify(); |
| 249 | std::string paramsCmd; | 231 | std::string paramsCmd; |