[projmgr] Ensure $SolutionDir()$ and $ProjectDir()$ are evaluated

Author: grasci-arm

tools/projmgr/src/ProjMgrWorker.cpp

@@ -205,6 +205,10 @@ void ProjMgrWorker::AddContext(ContextDesc& descriptor, const TypePair& type, Co
     context.variables[RteConstants::AS_BUILD_TYPE] = context.type.build;
     context.variables[RteConstants::AS_TARGET_TYPE] = context.type.target;
 
+    // solution and project access sequences with absolute paths
+    context.absPathSequences[RteConstants::AS_SOLUTION_DIR_BR] = context.csolution->directory;
+    context.absPathSequences[RteConstants::AS_PROJECT_DIR_BR] = context.cproject->directory;
+
     CollectionUtils::PushBackUniquely(m_ymlOrderedContexts, context.name);
     m_contexts[context.name] = context;
   }

tools/projmgr/test/src/ProjMgrRpcTests.cpp

@@ -1492,8 +1492,10 @@ TEST_F(ProjMgrRpcTests, RpcGetVariables) {
   EXPECT_EQ(vars["Dpack"], testcmsispack_folder + "/ARM/RteTest_DFP/0.2.0/");
   EXPECT_EQ(vars["Pname"], "");
   EXPECT_EQ(vars["Project"], "variables");
+  EXPECT_EQ(vars["ProjectDir()"], testinput_folder + "/TestLayers");
   EXPECT_EQ(vars["OutDir()"], testinput_folder + "/TestLayers/out/variables/TargetType1/BuildType1");
   EXPECT_EQ(vars["Solution"], "variables");
+  EXPECT_EQ(vars["SolutionDir()"], testinput_folder + "/TestLayers");
   EXPECT_EQ(vars["TargetType"], "TargetType1");
   EXPECT_EQ(vars["VarBuildLayer"], "./variables/build1.clayer.yml");
   EXPECT_EQ(vars["VarSolution"], "./variables/app.clayer.yml");