From ee3c9840cc6cdfe7e68c21e251aa11e6be200503 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=EC=A2=85=ED=97=8C/MDE=20Lab=28SR=29/=EC=82=BC?= =?utf8?q?=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 29 Dec 2022 10:59:31 +0900 Subject: [PATCH] Changed the path of diagnostics tool (#455) Change-Id: I68c3697ad22d727ff6b4cbdfdc875a1378321f6c --- NativeLauncher/launcher/exec/corerun.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/NativeLauncher/launcher/exec/corerun.cc b/NativeLauncher/launcher/exec/corerun.cc index 939d543..29b7234 100644 --- a/NativeLauncher/launcher/exec/corerun.cc +++ b/NativeLauncher/launcher/exec/corerun.cc @@ -66,7 +66,7 @@ int main(int argc, const char* argv[]) { } std::string clrFilesPath(CLR_PATH); - std::string toolDllsPath(TOOL_PATH); + std::string toolDllsPath(clrFilesPath + "/SOS"); std::string managedAssemblyPath; std::string additionalProbingPath; @@ -116,9 +116,14 @@ int main(int argc, const char* argv[]) { _SERR("This command is not currently supported."); return -1; } else { - managedAssemblyPath = toolDllsPath + "/dotnet-" + arg + ".dll"; - - if (!isFile(managedAssemblyPath)) { + std::string toolDll = "/dotnet-" + arg + ".dll"; + std::string searchToolPath1 = toolDllsPath + toolDll; + std::string searchToolPath2 = std::string(TOOL_PATH) + toolDll; + if (isFile(searchToolPath1)) { + managedAssemblyPath = searchToolPath1; + } else if (isFile(searchToolPath2)) { + managedAssemblyPath = searchToolPath2; + } else { _SERR( "Could not execute because dotnet-%s does not exist.\n" "Go to https://developer.samsung.com/tizen to learn how to install tools.\n", argv[0]); -- 2.7.4