Skip to content

Merge master into MG_DU branch to fix CI builds #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Merge master into MG_DU branch to fix CI builds #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cfcf9f
Remove duplicate unit tests from libopeninv (#47)
davefiddes Nov 19, 2024
87f7f0f
Merge branch 'master' into MG_DU
davefiddes Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ get-deps:
$(Q)${MAKE} -C libopencm3

Test:
cd test && $(MAKE)
$(MAKE) -C test
$(MAKE) -C libopeninv/test
cleanTest:
cd test && $(MAKE) clean
$(MAKE) -C test clean
$(MAKE) -C libopeninv/test clean
46 changes: 35 additions & 11 deletions sinus.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1722,18 +1722,37 @@
<Unit filename="libopeninv/test/Makefile">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/stub_canhardware.cpp" />
<Unit filename="libopeninv/test/stub_canhardware.h" />
<Unit filename="libopeninv/test/stub_canhardware.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/stub_canhardware.h">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/stub_libopencm3.c">
<Option compilerVar="CC" />
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test-include/hwdefs.h">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test-include/param_prj.h">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test.h">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test_canmap.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test_fp.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test_fu.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test_main.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test-include/hwdefs.h" />
<Unit filename="libopeninv/test/test-include/param_prj.h" />
<Unit filename="libopeninv/test/test.h" />
<Unit filename="libopeninv/test/test_canmap.cpp" />
<Unit filename="libopeninv/test/test_fp.cpp" />
<Unit filename="libopeninv/test/test_fu.cpp" />
<Unit filename="libopeninv/test/test_main.cpp" />
<Unit filename="src/GD31xxOI.cpp" />
<Unit filename="src/hwinit.cpp" />
<Unit filename="src/inc_encoder.cpp" />
Expand All @@ -1753,10 +1772,15 @@
<Unit filename="test/Makefile">
<Option target="Test" />
</Unit>
<Unit filename="test/stub_canhardware.cpp" />
<Unit filename="test/stub_canhardware.h" />
<Unit filename="test/stub_canhardware.cpp">
<Option target="Test" />
</Unit>
<Unit filename="test/stub_canhardware.h">
<Option target="Test" />
</Unit>
<Unit filename="test/stub_libopencm3.c">
<Option compilerVar="CC" />
<Option target="Test" />
</Unit>
<Unit filename="test/test.h" />
<Unit filename="test/test_fp.cpp" />
Expand Down
Loading