[projmgr] Rename *.cbuild-run.yml

Author: spcaipers-arm

tools/projmgr/include/ProjMgrRunDebug.h

@@ -56,6 +56,7 @@ struct DebugSequencesType {
  */
 struct RunDebugType {
   std::string solution;
+  std::string solutionName;
   std::string targetType;
   std::string compiler;
   std::string board;

tools/projmgr/src/ProjMgrCbuildRun.cpp

@@ -102,7 +102,8 @@ void ProjMgrCbuildRun::SetDebugSequencesBlockNode(YAML::Node node, const std::ve
 //-- ProjMgrYamlEmitter::GenerateCbuildRun --------------------------------------------------------
 bool ProjMgrYamlEmitter::GenerateCbuildRun(const RunDebugType& debugRun) {
   // generate cbuild-run.yml
-  const string& filename = m_outputDir + "/" + debugRun.targetType + ".cbuild-run.yml";
+  const string& filename = m_outputDir + "/" + debugRun.solutionName + "+" +
+    debugRun.targetType + ".cbuild-run.yml";
   YAML::Node rootNode;
   ProjMgrCbuildRun cbuildRun(rootNode[YAML_CBUILD_RUN], debugRun, m_outputDir);
   return WriteFile(rootNode, filename);

tools/projmgr/src/ProjMgrRunDebug.cpp

@@ -25,6 +25,7 @@ bool ProjMgrRunDebug::CollectSettings(const vector<ContextItem*>& contexts) {
 
   // get target settings
   const auto& context = contexts.front();
+  m_runDebug.solutionName = context->csolution->name;
   m_runDebug.solution = context->csolution->path;
   m_runDebug.targetType = context->type.target;
   m_runDebug.compiler = context->compiler;

…a/TestRunDebug/ref/TestHW.cbuild-run.yml …ebug/ref/run-debug+TestHW.cbuild-run.ymltools/projmgr/test/data/TestRunDebug/ref/TestHW.cbuild-run.yml renamed to tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW.cbuild-run.yml tools/projmgr/test/data/TestRunDebug/ref/TestHW.cbuild-run.yml renamed to tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW.cbuild-run.yml

@@ -6595,6 +6595,6 @@ TEST_F(ProjMgrUnitTests, TestRunDebug) {
   argv[5] = (char*)testoutput_folder.c_str();
   EXPECT_EQ(0, RunProjMgr(6, argv, m_envp));
 
-  ProjMgrTestEnv::CompareFile(testoutput_folder + "/TestHW.cbuild-run.yml",
-    testinput_folder + "/TestRunDebug/ref/TestHW.cbuild-run.yml");
+  ProjMgrTestEnv::CompareFile(testoutput_folder + "/run-debug+TestHW.cbuild-run.yml",
+    testinput_folder + "/TestRunDebug/ref/run-debug+TestHW.cbuild-run.yml");
 }