Skip to content

Commit 0ade53d

Browse files
committed
Separated unittests build rule from native build rules
JerryScript-DCO-1.0-Signed-off-by: Akos Kiss [email protected]
1 parent 2344afc commit 0ade53d

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ export JERRY_STM32F4_TARGETS := \
123123
$(foreach __MOD,$(MCU_MODS), \
124124
$(__MODE).mcu_stm32f4-$(__MOD)))
125125

126-
export JERRY_TARGETS := $(JERRY_NATIVE_TARGETS) $(JERRY_STM32F3_TARGETS) $(JERRY_STM32F4_TARGETS) unittests
127-
128126
# Precommit check targets
129127
export PRECOMMIT_CHECK_TARGETS := \
130128
$(foreach __MODE,$(DEBUG_MODES) $(RELEASE_MODES), \
@@ -246,7 +244,7 @@ check-cpp.$(1): $$(BUILD_DIR)/$(2)/Makefile prerequisites
246244
$$(Q)+$$(call SHLOG,$$(BUILD_COMMAND) -C $$(BUILD_DIR)/$(2) cppcheck.$(1),$$(BUILD_DIR)/$(2)/cppcheck.$(1).log,cppcheck run)
247245
endef
248246

249-
$(foreach __TARGET,$(JERRY_NATIVE_TARGETS) unittests, \
247+
$(foreach __TARGET,$(JERRY_NATIVE_TARGETS), \
250248
$(eval $(call CPPCHECK_RULE,$(__TARGET),$(NATIVE_SYSTEM))))
251249

252250
$(foreach __TARGET,$(JERRY_STM32F3_TARGETS), \
@@ -255,6 +253,8 @@ $(foreach __TARGET,$(JERRY_STM32F3_TARGETS), \
255253
$(foreach __TARGET,$(JERRY_STM32F4_TARGETS), \
256254
$(eval $(call CPPCHECK_RULE,$(__TARGET),stm32f4)))
257255

256+
$(eval $(call CPPCHECK_RULE,unittests,$(NATIVE_SYSTEM)))
257+
258258
# Make rule macro to build a/some target(s) and copy out the result(s).
259259
#
260260
# $(1) - target to define in the current Makefile
@@ -278,10 +278,10 @@ $(1): $$(BUILD_DIR)/$(2)/Makefile prerequisites
278278
)
279279
endef
280280

281-
$(foreach __TARGET,$(JERRY_NATIVE_TARGETS) unittests, \
281+
$(foreach __TARGET,$(JERRY_NATIVE_TARGETS), \
282282
$(eval $(call BUILD_RULE,$(__TARGET),$(NATIVE_SYSTEM),$(__TARGET),Build)))
283283

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))
285285

286286
$(foreach __TARGET,$(JERRY_STM32F3_TARGETS), \
287287
$(eval $(call BUILD_RULE,$(__TARGET),stm32f3,$(__TARGET).bin,Build)))
@@ -293,6 +293,8 @@ $(foreach __TARGET,$(JERRY_STM32F4_TARGETS), \
293293

294294
$(eval $(call BUILD_RULE,build-all.mcu_stm32f4,stm32f4,$(patsubst %,%.bin,$(JERRY_STM32F4_TARGETS)),Build))
295295

296+
$(eval $(call BUILD_RULE,unittests,$(NATIVE_SYSTEM),unittests,Build))
297+
296298
# Targets to perform batch builds and checks
297299

298300
.PHONY: clean
@@ -308,7 +310,7 @@ check-vera: prerequisites
308310
$(Q) ./tools/check-vera.sh
309311

310312
.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)
312314

313315
.PHONY: build
314316
build: $(patsubst %,build-all.%,$(NATIVE_SYSTEM) $(foreach __SYSTEM,$(MCU_SYSTEMS),mcu_$(__SYSTEM)))
@@ -324,7 +326,7 @@ run-unittests: unittests
324326
precommit:
325327
$(Q) $(MAKE) clean
326328
$(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
328330
$(Q) echo -e "\n================ Build completed successfully. Running precommit tests ================\n"
329331
$(Q) echo -e "All targets were built successfully. Starting unit tests' run.\n"
330332
$(Q)+$(MAKE) run-unittests

0 commit comments

Comments
 (0)