Skip to content

Commit

Permalink
Merge branch 'master' into MG_DU
Browse files Browse the repository at this point in the history
Fix CI builds for MG_DU by merging in changes from the master branch. Some manual merging of the
test/Makefile and sinus.cbp project files were
required.

Tests:
 - Build and run unit tests locally from the shell
 - Build and run unit tests from Code::Blocks
  • Loading branch information
davefiddes committed Jan 8, 2025
2 parents 85270cf + 7cfcf9f commit 87f7f0f
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 13 deletions.
6 changes: 4 additions & 2 deletions Makefile
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
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

0 comments on commit 87f7f0f

Please sign in to comment.