diff options
author | Bill Richardson <wfrichar@chromium.org> | 2013-07-25 11:21:30 -0700 |
---|---|---|
committer | Bill Richardson <wfrichar@chromium.org> | 2013-07-30 10:36:56 -0700 |
commit | 9d2a38fcabf59273edfd5dbb17cddeb467b2a5a0 (patch) | |
tree | f04ebd59bf0a53d70107e9564115600a169ec2df | |
parent | e4b1a6de89f943b43260491355d6ed5ac64318c8 (diff) | |
download | chrome-ec-9d2a38fcabf59273edfd5dbb17cddeb467b2a5a0.tar.gz |
Change macro names used for test configurations
We can't change CONFIG_ options from the gcc commandline, because
include/configs.h explicitly undefs them again. So for some tests, we add a
-DFOO to the command line and then put this in the source:
This change just uses TEST_FOO instead of FOO, so it's more obvious what's
happening.
BUG=chrome-os-partner:20739
BRANCH=falco,peppy
TEST=manual
No functional change, just renaming. Run
make BOARD=${BOARD} runtests
Everything should still pass.
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/63371
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
(cherry picked from commit 4231660869f6b282c5a589abb22e98681c052929)
Change-Id: I8f8e10dc5c342abd7850fb01286723148cddfcf8
Reviewed-on: https://gerrit.chromium.org/gerrit/63734
Commit-Queue: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>
-rw-r--r-- | board/host/board.h | 4 | ||||
-rw-r--r-- | test/test_config.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/host/board.h b/board/host/board.h index ad553b0c02..fe0d29e069 100644 --- a/board/host/board.h +++ b/board/host/board.h @@ -16,14 +16,14 @@ #undef CONFIG_WATCHDOG /* Host test config */ -#ifdef SMART_BATTERY_CHARGER +#ifdef TEST_SMART_BATTERY_CHARGER #define CONFIG_BATTERY_MOCK #define CONFIG_CHARGER #define CONFIG_CHARGER_INPUT_CURRENT 4032 #endif /* Keyboard protocol */ -#ifdef KB_8042 +#ifdef TEST_KB_8042 #define CONFIG_KEYBOARD_PROTOCOL_8042 #else #define CONFIG_KEYBOARD_PROTOCOL_MKBP diff --git a/test/test_config.mk b/test/test_config.mk index 9837c0fe01..47cf63c64a 100644 --- a/test/test_config.mk +++ b/test/test_config.mk @@ -6,5 +6,5 @@ # per-test configuration # -CFLAGS-kb_8042=-DKB_8042 -CFLAGS-sbs_charging=-DSMART_BATTERY_CHARGER +CFLAGS-kb_8042=-DTEST_KB_8042 +CFLAGS-sbs_charging=-DTEST_SMART_BATTERY_CHARGER |