Fix precommit: should check all combinations of the options.

Now the precommit checks only the {release,debug} native targets and unittests
with all combinations. Because testing on every target needs a lots of efforts,
added a new target called "precommit_heavy".
This target checks all targets with every combinations.

JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély [email protected]

Author: Zsolt Borbély

Makefile

@@ -131,6 +131,7 @@ export JERRY_STM32F4_TARGETS = $(foreach __MODE,$(TARGET_DEBUG_MODES),$(foreach
                                $(foreach __MODE,$(TARGET_RELEASE_MODES),$(foreach __SYSTEM,$(TARGET_STM32F4_MODS),$(__MODE).$(__SYSTEM)))
 
 export JERRY_TARGETS = $(JERRY_NATIVE_TARGETS) $(JERRY_STM32F3_TARGETS) $(JERRY_STM32F4_TARGETS) unittests
+export JERRY_TARGETS_LIGHT = $(PRECOMMIT_CHECK_TARGETS_LIST) unittests
 
 export CHECK_TARGETS = $(foreach __TARGET,$(JERRY_NATIVE_TARGETS),$(__TARGET).check)
 export FLASH_TARGETS = $(foreach __TARGET,$(JERRY_STM32F3_TARGETS) $(JERRY_STM32F4_TARGETS),$(__TARGET).flash)
@@ -144,10 +145,18 @@ export SHELL=/bin/bash
  PRECOMMIT_CHECK_TARGETS_LIST := debug.$(TARGET_NATIVE_SYSTEMS) release.$(TARGET_NATIVE_SYSTEMS)
 
 # Building all options combinations
- OPTIONS_COMBINATIONS := $(foreach __OPTION,ON OFF,$(__COMBINATION)-VALGRIND-$(__OPTION))
- OPTIONS_COMBINATIONS := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS),$(foreach __OPTION,ON OFF,$(__COMBINATION)-VALGRIND_FREYA-$(__OPTION)))
- OPTIONS_COMBINATIONS := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS),$(foreach __OPTION,ON OFF,$(__COMBINATION)-LTO-$(__OPTION)))
- OPTIONS_COMBINATIONS := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS),$(foreach __OPTION,ON OFF,$(__COMBINATION)-ALL_IN_ONE-$(__OPTION)))
+# Valgrind and Valgrind-Freya doesn't compatible with each other, therefore we should skip these combinations.
+ OPTIONS_COMBINATIONS1 := $(foreach __OPTION,OFF,$(__COMBINATION)-VALGRIND-$(__OPTION))
+ OPTIONS_COMBINATIONS1 := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS1),$(foreach __OPTION,ON OFF,$(__COMBINATION)-VALGRIND_FREYA-$(__OPTION)))
+ OPTIONS_COMBINATIONS1 := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS1),$(foreach __OPTION,ON OFF,$(__COMBINATION)-LTO-$(__OPTION)))
+ OPTIONS_COMBINATIONS1 := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS1),$(foreach __OPTION,ON OFF,$(__COMBINATION)-ALL_IN_ONE-$(__OPTION)))
+
+ OPTIONS_COMBINATIONS2 := $(foreach __OPTION,ON,$(__COMBINATION)-VALGRIND-$(__OPTION))
+ OPTIONS_COMBINATIONS2 := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS2),$(foreach __OPTION,OFF,$(__COMBINATION)-VALGRIND_FREYA-$(__OPTION)))
+ OPTIONS_COMBINATIONS2 := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS2),$(foreach __OPTION,ON OFF,$(__COMBINATION)-LTO-$(__OPTION)))
+ OPTIONS_COMBINATIONS2 := $(foreach __COMBINATION,$(OPTIONS_COMBINATIONS2),$(foreach __OPTION,ON OFF,$(__COMBINATION)-ALL_IN_ONE-$(__OPTION)))
+
+ OPTIONS_COMBINATIONS := $(OPTIONS_COMBINATIONS1) $(OPTIONS_COMBINATIONS2)
 
 # Building current options string
  OPTIONS_STRING := -VALGRIND-$(VALGRIND)-VALGRIND_FREYA-$(VALGRIND_FREYA)-LTO-$(LTO)-ALL_IN_ONE-$(ALL_IN_ONE)
@@ -312,7 +321,11 @@ log: ./tools/git-scripts/log.sh
 
 .PHONY: precommit
 precommit: clean prerequisites
-	$(Q) ./tools/precommit.sh "$(MAKE)" "$(OUT_DIR)" "$(PRECOMMIT_CHECK_TARGETS_LIST)"
+	$(Q) ./tools/precommit.sh "$(MAKE)" "$(OUT_DIR)" "$(PRECOMMIT_CHECK_TARGETS_LIST)" "$(JERRY_TARGETS_LIGHT)" "$(OPTIONS_COMBINATIONS)"
+
+.PHONY: precommit_heavy
+precommit_heavy: clean prerequisites
+	$(Q) ./tools/precommit.sh "$(MAKE)" "$(OUT_DIR)" "$(PRECOMMIT_CHECK_TARGETS_LIST)" "$(JERRY_TARGETS)" "$(OPTIONS_COMBINATIONS)"
 
 .PHONY: unittests_run
 unittests_run: unittests

tools/precommit.sh

@@ -23,6 +23,12 @@ shift
 TARGETS="$1"
 shift
 
+JERRY_TARGETS="$1"
+shift
+
+OPTIONS_COMBINATIONS="$1"
+shift
+
 commit_hash=`git show -s --format=%H HEAD`
 author_name=`git show -s --format=%an HEAD`
 author_email=`git show -s --format=%ae HEAD`
@@ -51,7 +57,31 @@ then
 fi
 
 echo -e "\nBuilding...\n\n"
-$MAKE STATIC_CHECK=ON build || exit 1
+
+static_check="OFF"
+for target in ${JERRY_TARGETS}; do
+	if [[ "$target" =~ "debug" ]] || [[ "$target" =~ "unittests" ]]
+	then
+		static_check="ON"
+	else
+		static_check="OFF"
+	fi
+
+	for combination in ${OPTIONS_COMBINATIONS}; do
+		# Split the options-string on '-' delimiter into 'options' array
+		options=(${combination//-/ })
+		length=${#options[@]}
+		curr_options=""
+
+		# Specify option-value pairs
+		for ((i=0; i<${length}; i+=2)); do
+			curr_options+="${options[i]}=${options[i+1]} "
+		done;
+
+		$MAKE STATIC_CHECK=${static_check} ${curr_options} ${target} || exit 1
+	done;
+done;
+
 echo -e "\n================ Build completed successfully. Running precommit tests ================\n"
 echo -e "All targets were built successfully. Starting unit tests' run.\n"
 $MAKE unittests_run || exit 1