Do not use hard-to-read relative paths in CMake

pull/55/head
Alan Dragomirecký 2021-07-09 23:30:39 +02:00 committed by DRracer
parent 3a131cfa0a
commit cf5b1c3955
12 changed files with 168 additions and 164 deletions

View File

@ -17,6 +17,9 @@ endfunction()
add_executable(system_tests ${CMAKE_CURRENT_SOURCE_DIR}/system_test.cpp) add_executable(system_tests ${CMAKE_CURRENT_SOURCE_DIR}/system_test.cpp)
add_catch_test(system_tests) add_catch_test(system_tests)
set(MODULES_STUBS_DIR ${CMAKE_SOURCE_DIR}/tests/unit/modules/stubs)
set(LOGIC_STUBS_DIR ${CMAKE_SOURCE_DIR}/tests/unit/logic/stubs)
# now, include all the unit tests; they should add themselves using the add_catch_test function # now, include all the unit tests; they should add themselves using the add_catch_test function
add_subdirectory(hal) add_subdirectory(hal)
add_subdirectory(logic) add_subdirectory(logic)

View File

@ -1,27 +1,27 @@
# define the test executable # define the test executable
add_executable( add_executable(
cut_filament_tests cut_filament_tests
../../../../src/logic/cut_filament.cpp ${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
../../../../src/logic/feed_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_finda.cpp
../../../../src/logic/unload_filament.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_filament.cpp
../../../../src/logic/unload_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_to_finda.cpp
../../../../src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp
../../../../src/modules/debouncer.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
../../../../src/modules/finda.cpp ${CMAKE_SOURCE_DIR}/src/modules/finda.cpp
../../../../src/modules/fsensor.cpp ${CMAKE_SOURCE_DIR}/src/modules/fsensor.cpp
../../../../src/modules/globals.cpp ${CMAKE_SOURCE_DIR}/src/modules/globals.cpp
../../../../src/modules/idler.cpp ${CMAKE_SOURCE_DIR}/src/modules/idler.cpp
../../../../src/modules/leds.cpp ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp
../../../../src/modules/permanent_storage.cpp ${CMAKE_SOURCE_DIR}/src/modules/permanent_storage.cpp
../../../../src/modules/selector.cpp ${CMAKE_SOURCE_DIR}/src/modules/selector.cpp
../../../../src/modules/user_input.cpp ${CMAKE_SOURCE_DIR}/src/modules/user_input.cpp
../../modules/stubs/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_adc.cpp
../../modules/stubs/stub_eeprom.cpp ${MODULES_STUBS_DIR}/stub_eeprom.cpp
../../modules/stubs/stub_gpio.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp
../../modules/stubs/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
../../modules/stubs/stub_timebase.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp
../stubs/main_loop_stub.cpp ${LOGIC_STUBS_DIR}/main_loop_stub.cpp
../stubs/stub_motion.cpp ${LOGIC_STUBS_DIR}/stub_motion.cpp
test_cut_filament.cpp test_cut_filament.cpp
) )

View File

@ -1,27 +1,27 @@
# define the test executable # define the test executable
add_executable( add_executable(
eject_filament_tests eject_filament_tests
../../../../src/logic/eject_filament.cpp ${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
../../../../src/logic/feed_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_finda.cpp
../../../../src/logic/unload_filament.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_filament.cpp
../../../../src/logic/unload_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_to_finda.cpp
../../../../src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp
../../../../src/modules/debouncer.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
../../../../src/modules/finda.cpp ${CMAKE_SOURCE_DIR}/src/modules/finda.cpp
../../../../src/modules/fsensor.cpp ${CMAKE_SOURCE_DIR}/src/modules/fsensor.cpp
../../../../src/modules/globals.cpp ${CMAKE_SOURCE_DIR}/src/modules/globals.cpp
../../../../src/modules/idler.cpp ${CMAKE_SOURCE_DIR}/src/modules/idler.cpp
../../../../src/modules/leds.cpp ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp
../../../../src/modules/permanent_storage.cpp ${CMAKE_SOURCE_DIR}/src/modules/permanent_storage.cpp
../../../../src/modules/selector.cpp ${CMAKE_SOURCE_DIR}/src/modules/selector.cpp
../../../../src/modules/user_input.cpp ${CMAKE_SOURCE_DIR}/src/modules/user_input.cpp
../../modules/stubs/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_adc.cpp
../../modules/stubs/stub_eeprom.cpp ${MODULES_STUBS_DIR}/stub_eeprom.cpp
../../modules/stubs/stub_gpio.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp
../../modules/stubs/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
../../modules/stubs/stub_timebase.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp
../stubs/main_loop_stub.cpp ${LOGIC_STUBS_DIR}/main_loop_stub.cpp
../stubs/stub_motion.cpp ${LOGIC_STUBS_DIR}/stub_motion.cpp
test_eject_filament.cpp test_eject_filament.cpp
) )

View File

@ -1,24 +1,24 @@
# define the test executable # define the test executable
add_executable( add_executable(
feed_to_bondtech_tests feed_to_bondtech_tests
../../../../src/logic/feed_to_bondtech.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_bondtech.cpp
../../../../src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp
../../../../src/modules/debouncer.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
../../../../src/modules/finda.cpp ${CMAKE_SOURCE_DIR}/src/modules/finda.cpp
../../../../src/modules/fsensor.cpp ${CMAKE_SOURCE_DIR}/src/modules/fsensor.cpp
../../../../src/modules/globals.cpp ${CMAKE_SOURCE_DIR}/src/modules/globals.cpp
../../../../src/modules/idler.cpp ${CMAKE_SOURCE_DIR}/src/modules/idler.cpp
../../../../src/modules/leds.cpp ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp
../../../../src/modules/permanent_storage.cpp ${CMAKE_SOURCE_DIR}/src/modules/permanent_storage.cpp
../../../../src/modules/selector.cpp ${CMAKE_SOURCE_DIR}/src/modules/selector.cpp
../../../../src/modules/user_input.cpp ${CMAKE_SOURCE_DIR}/src/modules/user_input.cpp
../../modules/stubs/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_adc.cpp
../../modules/stubs/stub_eeprom.cpp ${MODULES_STUBS_DIR}/stub_eeprom.cpp
../../modules/stubs/stub_gpio.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp
../../modules/stubs/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
../../modules/stubs/stub_timebase.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp
../stubs/main_loop_stub.cpp ${LOGIC_STUBS_DIR}/main_loop_stub.cpp
../stubs/stub_motion.cpp ${LOGIC_STUBS_DIR}/stub_motion.cpp
test_feed_to_bondtech.cpp test_feed_to_bondtech.cpp
) )

View File

@ -1,24 +1,24 @@
# define the test executable # define the test executable
add_executable( add_executable(
feed_to_finda_tests feed_to_finda_tests
../../../../src/logic/feed_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_finda.cpp
../../../../src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp
../../../../src/modules/debouncer.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
../../../../src/modules/finda.cpp ${CMAKE_SOURCE_DIR}/src/modules/finda.cpp
../../../../src/modules/fsensor.cpp ${CMAKE_SOURCE_DIR}/src/modules/fsensor.cpp
../../../../src/modules/globals.cpp ${CMAKE_SOURCE_DIR}/src/modules/globals.cpp
../../../../src/modules/idler.cpp ${CMAKE_SOURCE_DIR}/src/modules/idler.cpp
../../../../src/modules/leds.cpp ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp
../../../../src/modules/permanent_storage.cpp ${CMAKE_SOURCE_DIR}/src/modules/permanent_storage.cpp
../../../../src/modules/selector.cpp ${CMAKE_SOURCE_DIR}/src/modules/selector.cpp
../../../../src/modules/user_input.cpp ${CMAKE_SOURCE_DIR}/src/modules/user_input.cpp
../../modules/stubs/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_adc.cpp
../../modules/stubs/stub_eeprom.cpp ${MODULES_STUBS_DIR}/stub_eeprom.cpp
../../modules/stubs/stub_gpio.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp
../../modules/stubs/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
../../modules/stubs/stub_timebase.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp
../stubs/main_loop_stub.cpp ${LOGIC_STUBS_DIR}/main_loop_stub.cpp
../stubs/stub_motion.cpp ${LOGIC_STUBS_DIR}/stub_motion.cpp
test_feed_to_finda.cpp test_feed_to_finda.cpp
) )

View File

@ -1,26 +1,26 @@
# define the test executable # define the test executable
add_executable( add_executable(
load_filament_tests load_filament_tests
../../../../src/logic/feed_to_bondtech.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_bondtech.cpp
../../../../src/logic/feed_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_finda.cpp
../../../../src/logic/load_filament.cpp ${CMAKE_SOURCE_DIR}/src/logic/load_filament.cpp
../../../../src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp
../../../../src/modules/debouncer.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
../../../../src/modules/finda.cpp ${CMAKE_SOURCE_DIR}/src/modules/finda.cpp
../../../../src/modules/fsensor.cpp ${CMAKE_SOURCE_DIR}/src/modules/fsensor.cpp
../../../../src/modules/globals.cpp ${CMAKE_SOURCE_DIR}/src/modules/globals.cpp
../../../../src/modules/idler.cpp ${CMAKE_SOURCE_DIR}/src/modules/idler.cpp
../../../../src/modules/leds.cpp ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp
../../../../src/modules/permanent_storage.cpp ${CMAKE_SOURCE_DIR}/src/modules/permanent_storage.cpp
../../../../src/modules/selector.cpp ${CMAKE_SOURCE_DIR}/src/modules/selector.cpp
../../../../src/modules/user_input.cpp ${CMAKE_SOURCE_DIR}/src/modules/user_input.cpp
../../modules/stubs/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_adc.cpp
../../modules/stubs/stub_eeprom.cpp ${MODULES_STUBS_DIR}/stub_eeprom.cpp
../../modules/stubs/stub_gpio.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp
../../modules/stubs/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
../../modules/stubs/stub_timebase.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp
../stubs/main_loop_stub.cpp ${LOGIC_STUBS_DIR}/main_loop_stub.cpp
../stubs/stub_motion.cpp ${LOGIC_STUBS_DIR}/stub_motion.cpp
test_load_filament.cpp test_load_filament.cpp
) )

View File

@ -1,29 +1,29 @@
# define the test executable # define the test executable
add_executable( add_executable(
tool_change_tests tool_change_tests
../../../../src/logic/feed_to_bondtech.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_bondtech.cpp
../../../../src/logic/feed_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_finda.cpp
../../../../src/logic/load_filament.cpp ${CMAKE_SOURCE_DIR}/src/logic/load_filament.cpp
../../../../src/logic/tool_change.cpp ${CMAKE_SOURCE_DIR}/src/logic/tool_change.cpp
../../../../src/logic/unload_filament.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_filament.cpp
../../../../src/logic/unload_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_to_finda.cpp
../../../../src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp
../../../../src/modules/debouncer.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
../../../../src/modules/finda.cpp ${CMAKE_SOURCE_DIR}/src/modules/finda.cpp
../../../../src/modules/fsensor.cpp ${CMAKE_SOURCE_DIR}/src/modules/fsensor.cpp
../../../../src/modules/globals.cpp ${CMAKE_SOURCE_DIR}/src/modules/globals.cpp
../../../../src/modules/idler.cpp ${CMAKE_SOURCE_DIR}/src/modules/idler.cpp
../../../../src/modules/leds.cpp ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp
../../../../src/modules/permanent_storage.cpp ${CMAKE_SOURCE_DIR}/src/modules/permanent_storage.cpp
../../../../src/modules/selector.cpp ${CMAKE_SOURCE_DIR}/src/modules/selector.cpp
../../../../src/modules/user_input.cpp ${CMAKE_SOURCE_DIR}/src/modules/user_input.cpp
../../modules/stubs/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_adc.cpp
../../modules/stubs/stub_eeprom.cpp ${MODULES_STUBS_DIR}/stub_eeprom.cpp
../../modules/stubs/stub_gpio.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp
../../modules/stubs/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
../../modules/stubs/stub_timebase.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp
../stubs/main_loop_stub.cpp ${LOGIC_STUBS_DIR}/main_loop_stub.cpp
../stubs/stub_motion.cpp ${LOGIC_STUBS_DIR}/stub_motion.cpp
test_tool_change.cpp test_tool_change.cpp
) )

View File

@ -1,26 +1,26 @@
# define the test executable # define the test executable
add_executable( add_executable(
unload_filament_tests unload_filament_tests
../../../../src/logic/feed_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/feed_to_finda.cpp
../../../../src/logic/unload_filament.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_filament.cpp
../../../../src/logic/unload_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_to_finda.cpp
../../../../src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp
../../../../src/modules/debouncer.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
../../../../src/modules/finda.cpp ${CMAKE_SOURCE_DIR}/src/modules/finda.cpp
../../../../src/modules/fsensor.cpp ${CMAKE_SOURCE_DIR}/src/modules/fsensor.cpp
../../../../src/modules/globals.cpp ${CMAKE_SOURCE_DIR}/src/modules/globals.cpp
../../../../src/modules/idler.cpp ${CMAKE_SOURCE_DIR}/src/modules/idler.cpp
../../../../src/modules/leds.cpp ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp
../../../../src/modules/permanent_storage.cpp ${CMAKE_SOURCE_DIR}/src/modules/permanent_storage.cpp
../../../../src/modules/selector.cpp ${CMAKE_SOURCE_DIR}/src/modules/selector.cpp
../../../../src/modules/user_input.cpp ${CMAKE_SOURCE_DIR}/src/modules/user_input.cpp
../../modules/stubs/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_adc.cpp
../../modules/stubs/stub_eeprom.cpp ${MODULES_STUBS_DIR}/stub_eeprom.cpp
../../modules/stubs/stub_gpio.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp
../../modules/stubs/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
../../modules/stubs/stub_timebase.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp
../stubs/main_loop_stub.cpp ${LOGIC_STUBS_DIR}/main_loop_stub.cpp
../stubs/stub_motion.cpp ${LOGIC_STUBS_DIR}/stub_motion.cpp
test_unload_filament.cpp test_unload_filament.cpp
) )

View File

@ -1,24 +1,24 @@
# define the test executable # define the test executable
add_executable( add_executable(
unload_to_finda_tests unload_to_finda_tests
../../../../src/logic/unload_to_finda.cpp ${CMAKE_SOURCE_DIR}/src/logic/unload_to_finda.cpp
../../../../src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp
../../../../src/modules/debouncer.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
../../../../src/modules/finda.cpp ${CMAKE_SOURCE_DIR}/src/modules/finda.cpp
../../../../src/modules/fsensor.cpp ${CMAKE_SOURCE_DIR}/src/modules/fsensor.cpp
../../../../src/modules/globals.cpp ${CMAKE_SOURCE_DIR}/src/modules/globals.cpp
../../../../src/modules/idler.cpp ${CMAKE_SOURCE_DIR}/src/modules/idler.cpp
../../../../src/modules/leds.cpp ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp
../../../../src/modules/permanent_storage.cpp ${CMAKE_SOURCE_DIR}/src/modules/permanent_storage.cpp
../../../../src/modules/selector.cpp ${CMAKE_SOURCE_DIR}/src/modules/selector.cpp
../../../../src/modules/user_input.cpp ${CMAKE_SOURCE_DIR}/src/modules/user_input.cpp
../../modules/stubs/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_adc.cpp
../../modules/stubs/stub_eeprom.cpp ${MODULES_STUBS_DIR}/stub_eeprom.cpp
../../modules/stubs/stub_gpio.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp
../../modules/stubs/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
../../modules/stubs/stub_timebase.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp
../stubs/main_loop_stub.cpp ${LOGIC_STUBS_DIR}/main_loop_stub.cpp
../stubs/stub_motion.cpp ${LOGIC_STUBS_DIR}/stub_motion.cpp
test_unload_to_finda.cpp test_unload_to_finda.cpp
) )

View File

@ -1,7 +1,8 @@
# define the test executable # define the test executable
add_executable( add_executable(
buttons_tests ../../../../src/modules/buttons.cpp ../../../../src/modules/debouncer.cpp buttons_tests
../stubs/stub_adc.cpp ../stubs/stub_timebase.cpp test_buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/buttons.cpp ${CMAKE_SOURCE_DIR}/src/modules/debouncer.cpp
${MODULES_STUBS_DIR}/stub_adc.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp test_buttons.cpp
) )
# define required search paths # define required search paths

View File

@ -1,7 +1,7 @@
# define the test executable # define the test executable
add_executable( add_executable(
leds_tests ../../../../src/modules/leds.cpp ../stubs/stub_shr16.cpp ../stubs/stub_timebase.cpp leds_tests ${CMAKE_SOURCE_DIR}/src/modules/leds.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp
test_leds.cpp ${MODULES_STUBS_DIR}/stub_timebase.cpp test_leds.cpp
) )
# define required search paths # define required search paths

View File

@ -1,5 +1,5 @@
# define the test executable # define the test executable
add_executable(protocol_tests ../../../../src/modules/protocol.cpp test_protocol.cpp) add_executable(protocol_tests ${CMAKE_SOURCE_DIR}/src/modules/protocol.cpp test_protocol.cpp)
# define required search paths # define required search paths
target_include_directories(protocol_tests PUBLIC ${CMAKE_SOURCE_DIR}/src/modules) target_include_directories(protocol_tests PUBLIC ${CMAKE_SOURCE_DIR}/src/modules)