summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorVic Yang <victoryang@chromium.org>2013-08-03 04:01:39 +0800
committerChromeBot <chrome-bot@google.com>2013-08-04 13:11:08 -0700
commit19e30d9c7d1eed48e94952e5e73fdeb7d703656e (patch)
tree8cc3411bf7b53eb82b33e0bd226baea9f45a8287 /Makefile
parent219b02604cea6f5b9d245f49913544eae82b3694 (diff)
downloadchrome-ec-19e30d9c7d1eed48e94952e5e73fdeb7d703656e.tar.gz
Remove proxy config flags for unit tests
This moves per-test config flags from test_config.mk to test_config.h, where one can define/undefine config flags for individual test. BUG=chrome-os-partner:19235 TEST=Pass all tests BRANCH=None Change-Id: I096aded2007881433d3b6414d37f8bfdc6a2c45c Signed-off-by: Vic Yang <victoryang@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/64367 Reviewed-by: Vincent Palatin <vpalatin@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 582d0a5c16..8cd526109c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,8 @@ include Makefile.toolchain
# Get CHIP name
include board/$(BOARD)/build.mk
-# Get test configuration
-include test/test_config.mk
-
# Transform the configuration into make variables
-includes=include core/$(CORE)/include $(dirs) $(out)
+includes=include core/$(CORE)/include $(dirs) $(out) test
ifeq "$(TEST_BUILD)" "y"
_tsk_lst:=$(shell echo "CONFIG_TASK_LIST CONFIG_TEST_TASK_LIST" | \
$(CPP) -P -Iboard/$(BOARD) -Itest \