diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-01-10 13:54:53 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-01-14 06:40:22 +0000 |
| commit | 1447b6ca7edc7bc3900690c2c155dfbbd9fe07c6 (patch) | |
| tree | 8c026e91dd531798937925d188131e9dbf03a792 | |
| parent | 6ed5f4ff0559ead5806f9b8afe99cf0a6d7819d9 (diff) | |
| download | chrome-ec-1447b6ca7edc7bc3900690c2c155dfbbd9fe07c6.tar.gz | |
Fix test config being applied outside of test builds
Settings in test_config.h should only be applied #ifdef TEST_BUILD.
This fixes omitting vboot hash all time. It should only be omitted
for test builds.
BUG=None
Original-BUG=chrome-os-partner:24892
BRANCH=all
TEST=boot system; 'hash' command works on EC and system is not stuck in
recovery mode.
Change-Id: Ib2a614c07db34aa705b7a773c7040cad690da3df
Original-Change-Id: Ifd29a803ffdbc77b8eb141ea169c305746d19a63
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/182167
Reviewed-on: https://chromium-review.googlesource.com/182280
Commit-Queue: Dave Parker <dparker@chromium.org>
Tested-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/182423
Reviewed-by: Dave Parker <dparker@chromium.org>
| -rw-r--r-- | test/test_config.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/test_config.h b/test/test_config.h index 4767d034be..d88e71ced9 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -8,6 +8,9 @@ #ifndef __CROS_EC_TEST_CONFIG_H #define __CROS_EC_TEST_CONFIG_H +/* Test config flags only apply for test builds */ +#ifdef TEST_BUILD + /* Don't compile vboot hash support unless specifically testing for it */ #undef CONFIG_VBOOT_HASH @@ -79,4 +82,5 @@ int board_discharge_on_ac(int enabled); #define I2C_PORT_MASTER 1 #endif +#endif /* TEST_BUILD */ #endif /* __CROS_EC_TEST_CONFIG_H */ |