Skip to content

Commit 0f876d0

Browse files
committed
[projmgr] Test OutputDirsAbsolutePath
1 parent 3f8f03a commit 0f876d0

5 files changed

Lines changed: 13 additions & 44 deletions

File tree

.github/workflows/buildmgr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,3 +731,4 @@ jobs:
731731
with:
732732
name: Event File buildmgr
733733
path: ${{ github.event_path }}
734+

.github/workflows/nightly.yml

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,59 +8,25 @@ on:
88

99
jobs:
1010
buildmgr:
11-
if: github.repository == 'Open-CMSIS-Pack/devtools'
12-
uses: Open-CMSIS-Pack/devtools/.github/workflows/buildmgr.yml@main
11+
if: github.repository == 'brondani/devtools'
12+
uses: brondani/devtools/.github/workflows/buildmgr.yml@main
1313
secrets: inherit
1414
packchk:
1515
needs: [buildmgr]
16-
uses: Open-CMSIS-Pack/devtools/.github/workflows/packchk.yml@main
16+
uses: brondani/devtools/.github/workflows/packchk.yml@main
1717
secrets: inherit
1818
packgen:
1919
needs: [packchk]
20-
uses: Open-CMSIS-Pack/devtools/.github/workflows/packgen.yml@main
20+
uses: brondani/devtools/.github/workflows/packgen.yml@main
2121
secrets: inherit
2222
projmgr:
2323
needs: [packgen]
24-
uses: Open-CMSIS-Pack/devtools/.github/workflows/projmgr.yml@main
24+
uses: brondani/devtools/.github/workflows/projmgr.yml@main
2525
secrets: inherit
2626
svdconv:
2727
needs: [projmgr]
28-
uses: Open-CMSIS-Pack/devtools/.github/workflows/svdconv.yml@main
28+
uses: brondani/devtools/.github/workflows/svdconv.yml@main
2929
secrets: inherit
3030
test_libs:
3131
needs: [svdconv]
32-
uses: Open-CMSIS-Pack/devtools/.github/workflows/test_libs.yml@main
33-
coverage:
34-
runs-on: ubuntu-22.04
35-
needs: [ buildmgr, packchk, packgen, projmgr, svdconv, test_libs ]
36-
steps:
37-
- name: Harden Runner
38-
if: ${{ !github.event.repository.private }}
39-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
40-
with:
41-
egress-policy: audit
42-
43-
- name: Install dependencies
44-
run: |
45-
sudo apt-get update
46-
sudo apt-get install \
47-
lcov
48-
49-
- name: Download coverage report
50-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
51-
with:
52-
pattern: coverage-report-*
53-
path: coverage/
54-
merge-multiple: true
55-
56-
- name: Consolidate coverage data
57-
run: |
58-
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
59-
working-directory: coverage/
60-
61-
- name: Archive merged coverage report
62-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
63-
with:
64-
name: merged-coverage-report
65-
path: ./coverage/merged_coverage.info
66-
if-no-files-found: error
32+
uses: brondani/devtools/.github/workflows/test_libs.yml@main

.github/workflows/packchk.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,3 +372,4 @@ jobs:
372372
with:
373373
name: Event File packchk
374374
path: ${{ github.event_path }}
375+

.github/workflows/packgen.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,3 +331,4 @@ jobs:
331331
with:
332332
name: Event File packgen
333333
path: ${{ github.event_path }}
334+

tools/projmgr/test/src/ProjMgrUnitTests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4119,7 +4119,7 @@ TEST_F(ProjMgrUnitTests, OutputDirsTmpdirAccessSequence) {
41194119
}
41204120

41214121
TEST_F(ProjMgrUnitTests, OutputDirsAbsolutePath) {
4122-
StdStreamRedirect streamRedirect;
4122+
//StdStreamRedirect streamRedirect;
41234123
char* argv[5];
41244124
const string& csolution = testinput_folder + "/TestSolution/outdirs-absolute.csolution.yml";
41254125
argv[1] = (char*)"convert";
@@ -4128,8 +4128,8 @@ TEST_F(ProjMgrUnitTests, OutputDirsAbsolutePath) {
41284128
argv[4] = (char*)"--cbuildgen";
41294129
EXPECT_EQ(CrossPlatformUtils::GetHostType() == "win" ? 1 : 0, RunProjMgr(5, argv, m_envp));
41304130

4131-
auto errStr = streamRedirect.GetErrorString();
4132-
EXPECT_TRUE(regex_search(errStr, regex("warning csolution: absolute path .* is not portable, use relative path instead")));
4131+
//auto errStr = streamRedirect.GetErrorString();
4132+
//EXPECT_TRUE(regex_search(errStr, regex("warning csolution: absolute path .* is not portable, use relative path instead")));
41334133
}
41344134

41354135
TEST_F(ProjMgrUnitTests, ProjectSetup) {

0 commit comments

Comments
 (0)