Test the build options

Add new build target: test-buildoptions
Now every build option is tested on the proper targets. These are the native
and the MCU targets in release mode and unittests.
Therefore the USE_COMPILER_DEFAULT_LIBC build option is refactored.
This check is integrated into the precommit process.

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

Author: Zsolt Borbély

CMakeLists.txt

@@ -113,9 +113,9 @@ project (Jerry C ASM)
   set(MCU_SCRIPT_GENERATED_HEADER ${CMAKE_BINARY_DIR}/generated.h)
 
 # Should we use external libc?
- if(DEFINED USE_COMPILER_DEFAULT_LIBC AND USE_COMPILER_DEFAULT_LIBC STREQUAL "YES")
+ if(DEFINED COMPILER_DEFAULT_LIBC AND COMPILER_DEFAULT_LIBC STREQUAL "ON")
   if(DEFINED EXTERNAL_LIBC_INTERFACE AND NOT EXTERNAL_LIBC_INTERFACE STREQUAL "UNDEFINED")
-    message(FATAL_ERROR "EXTERNAL_LIBC_INTERFACE='${EXTERNAL_LIBC_INTERFACE}' should not be set in case compiler's default libc is used (USE_COMPILER_DEFAULT_LIBC=YES)")
+    message(FATAL_ERROR "EXTERNAL_LIBC_INTERFACE='${EXTERNAL_LIBC_INTERFACE}' should not be set in case compiler's default libc is used (COMPILER_DEFAULT_LIBC=ON)")
   endif()
 
   set(USE_JERRY_LIBC FALSE)

Makefile

@@ -81,16 +81,20 @@ BUILD_NAME:=
    BUILD_NAME:=$(BUILD_NAME)-ALL_IN_ONE-$(ALL_IN_ONE)
   endif
 
- # Flag, indicating whether to use compiler's default libc (YES / NO)
-  ifneq ($(USE_COMPILER_DEFAULT_LIBC),)
-   CMAKE_DEFINES:=$(CMAKE_DEFINES) -DUSE_COMPILER_DEFAULT_LIBC=$(USE_COMPILER_DEFAULT_LIBC)
+ # Flag, indicating whether to use compiler's default libc (ON / OFF)
+  ifneq ($(COMPILER_DEFAULT_LIBC),)
+   CMAKE_DEFINES:=$(CMAKE_DEFINES) -DCOMPILER_DEFAULT_LIBC=$(COMPILER_DEFAULT_LIBC)
   endif
 
  # Apply strip to release binaries
   ifneq ($(STRIP_RELEASE_BINARY),)
    CMAKE_DEFINES:=$(CMAKE_DEFINES) -DSTRIP_RELEASE_BINARY=$(STRIP_RELEASE_BINARY)
   endif
 
+# For testing build-options
+export BUILD_OPTIONS_TEST_MCU := LTO ALL_IN_ONE
+export BUILD_OPTIONS_TEST_NATIVE := $(BUILD_OPTIONS_TEST_MCU) VALGRIND VALGRIND_FREYA COMPILER_DEFAULT_LIBC
+
 # Directories
 export ROOT_DIR := $(shell pwd)
 export BUILD_DIR_PREFIX := $(ROOT_DIR)/build/obj
@@ -128,6 +132,15 @@ export JERRY_TEST_TARGETS_CP := \
   $(foreach __MODE,$(DEBUG_MODES) $(RELEASE_MODES), \
     $(__MODE).$(NATIVE_SYSTEM)-cp)
 
+# Build-options test targets
+export JERRY_BUILD_OPTIONS_TEST_TARGETS := \
+  $(foreach __MODE,$(RELEASE_MODES), \
+    $(__MODE).$(NATIVE_SYSTEM) \
+      $(foreach __SYSTEM,$(MCU_SYSTEMS), \
+        $(__MODE).mcu_$(__SYSTEM)))
+
+JERRY_BUILD_OPTIONS_TEST_TARGETS += unittests
+
 # JS test suites (in the format of id:path)
 export JERRY_TEST_SUITE_J := j:$(ROOT_DIR)/tests/jerry
 export JERRY_TEST_SUITE_JTS := jts:$(ROOT_DIR)/tests/jerry-test-suite
@@ -311,6 +324,19 @@ check-vera:
 check-cppcheck:
 	$(Q) $(call SHLOG,./tools/check-cppcheck.sh,$(OUT_DIR)/cppcheck.log,Cppcheck)
 
+.PHONY: test-buildoptions
+test-buildoptions:
+	$(Q) for target in $(JERRY_BUILD_OPTIONS_TEST_TARGETS); do \
+           if [[ $$target =~ "mcu" ]]; then \
+             current_options=$$BUILD_OPTIONS_TEST_MCU; \
+           else \
+             current_options=$$BUILD_OPTIONS_TEST_NATIVE; \
+           fi; \
+           for option in $$current_options; do \
+             $(MAKE) $$option=ON $$target || exit 1; \
+           done \
+         done
+
 .PHONY: build
 build: build.$(NATIVE_SYSTEM) $(foreach __SYSTEM,$(MCU_SYSTEMS),build.mcu_$(__SYSTEM))
 
@@ -339,6 +365,8 @@ precommit: prerequisites
 	$(Q)+$(MAKE) --no-print-directory clean
 	$(Q) echo "Running checks..."
 	$(Q)+$(MAKE) --no-print-directory check-signed-off check-vera check-cppcheck
+	$(Q) echo "...testing build-options..."
+	$(Q)+$(MAKE) --no-print-directory test-buildoptions
 	$(Q) echo "...building engine..."
 	$(Q)+$(MAKE) --no-print-directory build
 	$(Q) echo "...building and running unit tests..."

targets/mbedk64f/Makefile.mbedk64f

@@ -41,7 +41,7 @@ jerry:
 	 -DENABLE_LTO=OFF \
 	 -DENABLE_VALGRIND=OFF \
 	 -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
-	 -DUSE_COMPILER_DEFAULT_LIBC=YES \
+	 -DCOMPILER_DEFAULT_LIBC=ON \
 	 -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=arm7-m \
 	 -DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
 	 -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \