diff options
| author | Vic Yang <victoryang@chromium.org> | 2013-04-14 20:01:55 +0800 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-15 20:40:02 -0700 |
| commit | 216bb93128c2477d2c4053110e0b0df4ddd0b40f (patch) | |
| tree | 4378ec4f8c12cf3f572851049518dc8c46608189 /test/build.mk | |
| parent | 108235225d2536f75a3100cd535f44f732b486c3 (diff) | |
| download | chrome-ec-216bb93128c2477d2c4053110e0b0df4ddd0b40f.tar.gz | |
Fix flash tests
This merges flash_overwrite and flash_rw_erase to a single test binary.
BUG=chrome-os-partner:18598
TEST=Run on Spring
BRANCH=None
Change-Id: I1da7577cb5dc196178930dda3a07bb942d959866
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/48090
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'test/build.mk')
| -rw-r--r-- | test/build.mk | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/test/build.mk b/test/build.mk index 2fcdd3414d..6478577268 100644 --- a/test/build.mk +++ b/test/build.mk @@ -7,12 +7,10 @@ # test-list=hello pingpong timer_calib timer_dos timer_jump mutex thermal -test-list+=power_button kb_scan scancode typematic charging -test-list+=flash_overwrite flash_rw_erase utils +test-list+=power_button kb_scan scancode typematic charging flash #disable: powerdemo -flash_overwrite-y=flash.o -flash_rw_erase-y=flash.o +flash-y=flash.o kb_scan-y=kb_scan.o mutex-y=mutex.o pingpong-y=pingpong.o @@ -46,10 +44,3 @@ chip-mock-charging-gpio.o=mock_gpio.o common-mock-charging-x86_power.o=mock_x86_power.o common-mock-charging-smart_battery_stub.o=mock_smart_battery_stub.o common-mock-charging-charger_bq24725.o=mock_charger.o - -# Mock modules for 'flash_overwrite' -chip-mock-flash_overwrite-flash.o=mock_flash.o -chip-mock-flash_overwrite-gpio.o=mock_gpio.o - -# Mock modules for 'flash_rw_erase' -chip-mock-flash_rw_erase-flash.o=mock_flash.o |