From 9789f070ff6313de05804e318cc5e0d376a9caae Mon Sep 17 00:00:00 2001 From: Daniel Brondani Date: Thu, 15 May 2025 11:42:42 +0200 Subject: [PATCH 1/3] [projmgr] Update test case `OutputDirsAbsolutePath` --- .../test/data/TestSolution/outdirs-absolute.csolution.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/projmgr/test/data/TestSolution/outdirs-absolute.csolution.yml b/tools/projmgr/test/data/TestSolution/outdirs-absolute.csolution.yml index 6400780e0..2733863b6 100644 --- a/tools/projmgr/test/data/TestSolution/outdirs-absolute.csolution.yml +++ b/tools/projmgr/test/data/TestSolution/outdirs-absolute.csolution.yml @@ -17,6 +17,6 @@ solution: - project: ./TestProject1/test1.cproject.yml output-dirs: - cprjdir: C:/$Compiler$ + cprjdir: Z:/$Compiler$ intdir: /$Compiler$ tmpdir: /root From 3d05513af220fc04bff269d01f4a36a1ec1a43d7 Mon Sep 17 00:00:00 2001 From: Daniel Brondani Date: Thu, 15 May 2025 15:44:09 +0200 Subject: [PATCH 2/3] [projmgr] Replace `Z:` with UNC path `\\non_existing_cmsis` --- .../test/data/TestSolution/outdirs-absolute.csolution.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/projmgr/test/data/TestSolution/outdirs-absolute.csolution.yml b/tools/projmgr/test/data/TestSolution/outdirs-absolute.csolution.yml index 2733863b6..1f3430676 100644 --- a/tools/projmgr/test/data/TestSolution/outdirs-absolute.csolution.yml +++ b/tools/projmgr/test/data/TestSolution/outdirs-absolute.csolution.yml @@ -17,6 +17,6 @@ solution: - project: ./TestProject1/test1.cproject.yml output-dirs: - cprjdir: Z:/$Compiler$ + cprjdir: \\non_existing_cmsis/$Compiler$ intdir: /$Compiler$ tmpdir: /root From 0001e52a1d86a1df4c0a61dab3f3519cbcb644bc Mon Sep 17 00:00:00 2001 From: Daniel Brondani Date: Thu, 15 May 2025 15:56:41 +0200 Subject: [PATCH 3/3] [projmgr] Uniform test expectation for all platforms --- tools/projmgr/test/src/ProjMgrUnitTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/projmgr/test/src/ProjMgrUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUnitTests.cpp index e754cd5b4..7e73b6c12 100644 --- a/tools/projmgr/test/src/ProjMgrUnitTests.cpp +++ b/tools/projmgr/test/src/ProjMgrUnitTests.cpp @@ -4126,7 +4126,7 @@ TEST_F(ProjMgrUnitTests, OutputDirsAbsolutePath) { argv[2] = (char*)"--solution"; argv[3] = (char*)csolution.c_str(); argv[4] = (char*)"--cbuildgen"; - EXPECT_EQ(CrossPlatformUtils::GetHostType() == "win" ? 1 : 0, RunProjMgr(5, argv, m_envp)); + EXPECT_EQ(1, RunProjMgr(5, argv, m_envp)); auto errStr = streamRedirect.GetErrorString(); EXPECT_TRUE(regex_search(errStr, regex("warning csolution: absolute path .* is not portable, use relative path instead")));