Skip to content

Commit e0b4c50

Browse files
authored
Remove duplicate unit tests from libopeninv (#47) (#50)
As libopeninv now has unit tests remove the duplicates. Update the Makefile and Code::Blocks project to reference the new libopeninv tests and add missing files. Update the GitHub Action workflow to run both sets of tests.
1 parent 85270cf commit e0b4c50

File tree

2 files changed

+39
-13
lines changed

2 files changed

+39
-13
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ get-deps:
159159
$(Q)${MAKE} -C libopencm3
160160

161161
Test:
162-
cd test && $(MAKE)
162+
$(MAKE) -C test
163+
$(MAKE) -C libopeninv/test
163164
cleanTest:
164-
cd test && $(MAKE) clean
165+
$(MAKE) -C test clean
166+
$(MAKE) -C libopeninv/test clean

sinus.cbp

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,18 +1722,37 @@
17221722
<Unit filename="libopeninv/test/Makefile">
17231723
<Option target="Test libopeninv" />
17241724
</Unit>
1725-
<Unit filename="libopeninv/test/stub_canhardware.cpp" />
1726-
<Unit filename="libopeninv/test/stub_canhardware.h" />
1725+
<Unit filename="libopeninv/test/stub_canhardware.cpp">
1726+
<Option target="Test libopeninv" />
1727+
</Unit>
1728+
<Unit filename="libopeninv/test/stub_canhardware.h">
1729+
<Option target="Test libopeninv" />
1730+
</Unit>
17271731
<Unit filename="libopeninv/test/stub_libopencm3.c">
17281732
<Option compilerVar="CC" />
1733+
<Option target="Test libopeninv" />
1734+
</Unit>
1735+
<Unit filename="libopeninv/test/test-include/hwdefs.h">
1736+
<Option target="Test libopeninv" />
1737+
</Unit>
1738+
<Unit filename="libopeninv/test/test-include/param_prj.h">
1739+
<Option target="Test libopeninv" />
1740+
</Unit>
1741+
<Unit filename="libopeninv/test/test.h">
1742+
<Option target="Test libopeninv" />
1743+
</Unit>
1744+
<Unit filename="libopeninv/test/test_canmap.cpp">
1745+
<Option target="Test libopeninv" />
1746+
</Unit>
1747+
<Unit filename="libopeninv/test/test_fp.cpp">
1748+
<Option target="Test libopeninv" />
1749+
</Unit>
1750+
<Unit filename="libopeninv/test/test_fu.cpp">
1751+
<Option target="Test libopeninv" />
1752+
</Unit>
1753+
<Unit filename="libopeninv/test/test_main.cpp">
1754+
<Option target="Test libopeninv" />
17291755
</Unit>
1730-
<Unit filename="libopeninv/test/test-include/hwdefs.h" />
1731-
<Unit filename="libopeninv/test/test-include/param_prj.h" />
1732-
<Unit filename="libopeninv/test/test.h" />
1733-
<Unit filename="libopeninv/test/test_canmap.cpp" />
1734-
<Unit filename="libopeninv/test/test_fp.cpp" />
1735-
<Unit filename="libopeninv/test/test_fu.cpp" />
1736-
<Unit filename="libopeninv/test/test_main.cpp" />
17371756
<Unit filename="src/GD31xxOI.cpp" />
17381757
<Unit filename="src/hwinit.cpp" />
17391758
<Unit filename="src/inc_encoder.cpp" />
@@ -1753,10 +1772,15 @@
17531772
<Unit filename="test/Makefile">
17541773
<Option target="Test" />
17551774
</Unit>
1756-
<Unit filename="test/stub_canhardware.cpp" />
1757-
<Unit filename="test/stub_canhardware.h" />
1775+
<Unit filename="test/stub_canhardware.cpp">
1776+
<Option target="Test" />
1777+
</Unit>
1778+
<Unit filename="test/stub_canhardware.h">
1779+
<Option target="Test" />
1780+
</Unit>
17581781
<Unit filename="test/stub_libopencm3.c">
17591782
<Option compilerVar="CC" />
1783+
<Option target="Test" />
17601784
</Unit>
17611785
<Unit filename="test/test.h" />
17621786
<Unit filename="test/test_fp.cpp" />

0 commit comments

Comments
 (0)