@@ -123,8 +123,6 @@ export JERRY_STM32F4_TARGETS := \
123
123
$(foreach __MOD,$(MCU_MODS ) , \
124
124
$(__MODE ) .mcu_stm32f4-$(__MOD ) ) )
125
125
126
- export JERRY_TARGETS := $(JERRY_NATIVE_TARGETS ) $(JERRY_STM32F3_TARGETS ) $(JERRY_STM32F4_TARGETS ) unittests
127
-
128
126
# Precommit check targets
129
127
export PRECOMMIT_CHECK_TARGETS := \
130
128
$(foreach __MODE,$(DEBUG_MODES ) $(RELEASE_MODES ) , \
@@ -246,7 +244,7 @@ check-cpp.$(1): $$(BUILD_DIR)/$(2)/Makefile prerequisites
246
244
$$(Q ) +$$(call SHLOG,$$(BUILD_COMMAND ) -C $$(BUILD_DIR ) /$(2 ) cppcheck.$(1 ) ,$$(BUILD_DIR ) /$(2 ) /cppcheck.$(1 ) .log,cppcheck run)
247
245
endef
248
246
249
- $(foreach __TARGET,$(JERRY_NATIVE_TARGETS) unittests , \
247
+ $(foreach __TARGET,$(JERRY_NATIVE_TARGETS), \
250
248
$(eval $(call CPPCHECK_RULE,$(__TARGET),$(NATIVE_SYSTEM))))
251
249
252
250
$(foreach __TARGET,$(JERRY_STM32F3_TARGETS), \
@@ -255,6 +253,8 @@ $(foreach __TARGET,$(JERRY_STM32F3_TARGETS), \
255
253
$(foreach __TARGET,$(JERRY_STM32F4_TARGETS), \
256
254
$(eval $(call CPPCHECK_RULE,$(__TARGET),stm32f4)))
257
255
256
+ $(eval $(call CPPCHECK_RULE,unittests,$(NATIVE_SYSTEM)))
257
+
258
258
# Make rule macro to build a/some target(s) and copy out the result(s).
259
259
#
260
260
# $(1) - target to define in the current Makefile
@@ -278,10 +278,10 @@ $(1): $$(BUILD_DIR)/$(2)/Makefile prerequisites
278
278
)
279
279
endef
280
280
281
- $(foreach __TARGET,$(JERRY_NATIVE_TARGETS) unittests , \
281
+ $(foreach __TARGET,$(JERRY_NATIVE_TARGETS), \
282
282
$(eval $(call BUILD_RULE,$(__TARGET),$(NATIVE_SYSTEM),$(__TARGET),Build)))
283
283
284
- $(eval $(call BUILD_RULE,build-all.$(NATIVE_SYSTEM),$(NATIVE_SYSTEM),$(JERRY_NATIVE_TARGETS) unittests ,Build))
284
+ $(eval $(call BUILD_RULE,build-all.$(NATIVE_SYSTEM),$(NATIVE_SYSTEM),$(JERRY_NATIVE_TARGETS),Build))
285
285
286
286
$(foreach __TARGET,$(JERRY_STM32F3_TARGETS), \
287
287
$(eval $(call BUILD_RULE,$(__TARGET),stm32f3,$(__TARGET).bin,Build)))
@@ -293,6 +293,8 @@ $(foreach __TARGET,$(JERRY_STM32F4_TARGETS), \
293
293
294
294
$(eval $(call BUILD_RULE,build-all.mcu_stm32f4,stm32f4,$(patsubst %,%.bin,$(JERRY_STM32F4_TARGETS)),Build))
295
295
296
+ $(eval $(call BUILD_RULE,unittests,$(NATIVE_SYSTEM),unittests,Build))
297
+
296
298
# Targets to perform batch builds and checks
297
299
298
300
.PHONY : clean
@@ -308,7 +310,7 @@ check-vera: prerequisites
308
310
$(Q ) ./tools/check-vera.sh
309
311
310
312
.PHONY : check-cpp
311
- check-cpp : $(patsubst % ,check-cpp.% ,$(JERRY_TARGETS ) )
313
+ check-cpp : $(patsubst % ,check-cpp.% ,$(JERRY_NATIVE_TARGETS ) $( JERRY_STM32F3_TARGETS ) $( JERRY_STM32F4_TARGETS ) unittests )
312
314
313
315
.PHONY : build
314
316
build : $(patsubst % ,build-all.% ,$(NATIVE_SYSTEM ) $(foreach __SYSTEM,$(MCU_SYSTEMS ) ,mcu_$(__SYSTEM ) ) )
@@ -324,7 +326,7 @@ run-unittests: unittests
324
326
precommit :
325
327
$(Q ) $(MAKE ) clean
326
328
$(Q ) echo -e " \nBuilding...\n\n"
327
- $(Q ) +$(MAKE ) check-signed-off check-vera check-cpp build
329
+ $(Q ) +$(MAKE ) check-signed-off check-vera check-cpp build unittests
328
330
$(Q ) echo -e " \n================ Build completed successfully. Running precommit tests ================\n"
329
331
$(Q ) echo -e " All targets were built successfully. Starting unit tests' run.\n"
330
332
$(Q ) +$(MAKE ) run-unittests
0 commit comments