From 8f6da047a4320d825e82e6da49ce727e5d3718a9 Mon Sep 17 00:00:00 2001 From: Daniel Brondani Date: Wed, 14 May 2025 10:29:17 +0200 Subject: [PATCH] [projmgr] Test `OutputDirsAbsolutePath` --- .github/workflows/buildmgr.yml | 1 + .github/workflows/nightly.yml | 54 ++------------------- .github/workflows/packchk.yml | 1 + .github/workflows/packgen.yml | 1 + tools/projmgr/test/src/ProjMgrUnitTests.cpp | 6 +-- 5 files changed, 11 insertions(+), 52 deletions(-) diff --git a/.github/workflows/buildmgr.yml b/.github/workflows/buildmgr.yml index 6011664ad..6cf4624cc 100644 --- a/.github/workflows/buildmgr.yml +++ b/.github/workflows/buildmgr.yml @@ -731,3 +731,4 @@ jobs: with: name: Event File buildmgr path: ${{ github.event_path }} + diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7363452c5..c0f1ecae2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -8,59 +8,15 @@ on: jobs: buildmgr: - if: github.repository == 'Open-CMSIS-Pack/devtools' - uses: Open-CMSIS-Pack/devtools/.github/workflows/buildmgr.yml@main + if: github.repository == 'brondani/devtools' + uses: brondani/devtools/.github/workflows/buildmgr.yml@main secrets: inherit packchk: - needs: [buildmgr] - uses: Open-CMSIS-Pack/devtools/.github/workflows/packchk.yml@main + uses: brondani/devtools/.github/workflows/packchk.yml@main secrets: inherit packgen: - needs: [packchk] - uses: Open-CMSIS-Pack/devtools/.github/workflows/packgen.yml@main + uses: brondani/devtools/.github/workflows/packgen.yml@main secrets: inherit projmgr: - needs: [packgen] - uses: Open-CMSIS-Pack/devtools/.github/workflows/projmgr.yml@main + uses: brondani/devtools/.github/workflows/projmgr.yml@main secrets: inherit - svdconv: - needs: [projmgr] - uses: Open-CMSIS-Pack/devtools/.github/workflows/svdconv.yml@main - secrets: inherit - test_libs: - needs: [svdconv] - uses: Open-CMSIS-Pack/devtools/.github/workflows/test_libs.yml@main - coverage: - runs-on: ubuntu-22.04 - needs: [ buildmgr, packchk, packgen, projmgr, svdconv, test_libs ] - steps: - - name: Harden Runner - if: ${{ !github.event.repository.private }} - uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0 - with: - egress-policy: audit - - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install \ - lcov - - - name: Download coverage report - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 - with: - pattern: coverage-report-* - path: coverage/ - merge-multiple: true - - - name: Consolidate coverage data - run: | - lcov --rc lcov_branch_coverage=1 --add-tracefile coverage_packchk.info -a coverage_packgen.info -a coverage_projmgr.info -a coverage_buildmgr.info -a coverage_svdconv.info -o merged_coverage.info - working-directory: coverage/ - - - name: Archive merged coverage report - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 - with: - name: merged-coverage-report - path: ./coverage/merged_coverage.info - if-no-files-found: error diff --git a/.github/workflows/packchk.yml b/.github/workflows/packchk.yml index c60970d84..e59c29e2f 100644 --- a/.github/workflows/packchk.yml +++ b/.github/workflows/packchk.yml @@ -372,3 +372,4 @@ jobs: with: name: Event File packchk path: ${{ github.event_path }} + diff --git a/.github/workflows/packgen.yml b/.github/workflows/packgen.yml index 7bf4b23b5..b269975a7 100644 --- a/.github/workflows/packgen.yml +++ b/.github/workflows/packgen.yml @@ -331,3 +331,4 @@ jobs: with: name: Event File packgen path: ${{ github.event_path }} + diff --git a/tools/projmgr/test/src/ProjMgrUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUnitTests.cpp index e754cd5b4..6c6e4bb93 100644 --- a/tools/projmgr/test/src/ProjMgrUnitTests.cpp +++ b/tools/projmgr/test/src/ProjMgrUnitTests.cpp @@ -4119,7 +4119,7 @@ TEST_F(ProjMgrUnitTests, OutputDirsTmpdirAccessSequence) { } TEST_F(ProjMgrUnitTests, OutputDirsAbsolutePath) { - StdStreamRedirect streamRedirect; + //StdStreamRedirect streamRedirect; char* argv[5]; const string& csolution = testinput_folder + "/TestSolution/outdirs-absolute.csolution.yml"; argv[1] = (char*)"convert"; @@ -4128,8 +4128,8 @@ TEST_F(ProjMgrUnitTests, OutputDirsAbsolutePath) { argv[4] = (char*)"--cbuildgen"; EXPECT_EQ(CrossPlatformUtils::GetHostType() == "win" ? 1 : 0, 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"))); + //auto errStr = streamRedirect.GetErrorString(); + //EXPECT_TRUE(regex_search(errStr, regex("warning csolution: absolute path .* is not portable, use relative path instead"))); } TEST_F(ProjMgrUnitTests, ProjectSetup) {