From 2f661f9509180043ebb800b7974744da9d739dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zsolt=20Borb=C3=A9ly?=
 <zsborbely.u-szeged@partner.samsung.com>
Date: Fri, 25 Mar 2016 13:06:38 +0100
Subject: [PATCH] Modify the buildoption-test and add to Travis CI as a job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MCU-targets were removed from buildoption-test temporarily.

JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély zsborbely.u-szeged@partner.samsung.com
---
 .travis.yml |  1 +
 Makefile    | 17 ++---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ac3d4ad9..22582d1ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ env:
   - TARGET="check-signed-off check-vera check-cppcheck"
   - TARGET="build.linux test-js-precommit"
   - TARGET="build.linux test-js-precommit" TOOLCHAIN=build/configs/toolchain_linux_armv7l-hf.cmake TIMEOUT=300
+  - TARGET=test-buildoptions
   - TARGET=test-unit
 
 matrix:
diff --git a/Makefile b/Makefile
index 69f5459fe..79238dde4 100644
--- a/Makefile
+++ b/Makefile
@@ -106,8 +106,7 @@ BUILD_NAME:=
   endif
 
 # For testing build-options
-export BUILD_OPTIONS_TEST_MCU := LTO LOG DATE_SYS_CALLS ERROR_MESSAGES ALL_IN_ONE
-export BUILD_OPTIONS_TEST_NATIVE := $(BUILD_OPTIONS_TEST_MCU) VALGRIND VALGRIND_FREYA COMPILER_DEFAULT_LIBC
+export BUILD_OPTIONS_TEST_NATIVE := LTO LOG DATE_SYS_CALLS ERROR_MESSAGES ALL_IN_ONE VALGRIND VALGRIND_FREYA COMPILER_DEFAULT_LIBC
 
 # Directories
 export ROOT_DIR := $(shell pwd)
@@ -153,11 +152,6 @@ export JERRY_BUILD_OPTIONS_TEST_TARGETS_NATIVE := \
 
 JERRY_BUILD_OPTIONS_TEST_TARGETS_NATIVE += unittests
 
-export JERRY_BUILD_OPTIONS_TEST_TARGETS_MCU := \
-  $(foreach __MODE,$(RELEASE_MODES), \
-    $(foreach __SYSTEM,$(MCU_SYSTEMS), \
-      $(__MODE).mcu_$(__SYSTEM)))
-
 # 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
@@ -341,10 +335,6 @@ $(foreach __TARGET,$(JERRY_BUILD_OPTIONS_TEST_TARGETS_NATIVE), \
   $(foreach __OPTION, $(BUILD_OPTIONS_TEST_NATIVE), \
     $(eval $(call OPTIONSTEST_RULE,$(__TARGET),$(__OPTION)))))
 
-$(foreach __TARGET,$(JERRY_BUILD_OPTIONS_TEST_TARGETS_MCU), \
-  $(foreach __OPTION, $(BUILD_OPTIONS_TEST_MCU), \
-    $(eval $(call OPTIONSTEST_RULE,$(__TARGET),$(__OPTION)))))
-
 # Targets to perform batch builds, checks, and tests
 
 .PHONY: clean
@@ -390,10 +380,7 @@ test-js-precommit: \
 test-buildoptions: \
         $(foreach __TARGET,$(JERRY_BUILD_OPTIONS_TEST_TARGETS_NATIVE), \
           $(foreach __OPTION, $(BUILD_OPTIONS_TEST_NATIVE), \
-            test-option.$(__TARGET)-$(__OPTION))) \
-        $(foreach __TARGET,$(JERRY_BUILD_OPTIONS_TEST_TARGETS_MCU), \
-          $(foreach __OPTION, $(BUILD_OPTIONS_TEST_MCU), \
-            test-option.$(__TARGET)-$(__OPTION))) \
+            test-option.$(__TARGET)-$(__OPTION)))
 
 .PHONY: precommit
 precommit: prerequisites