diff options
| author | Vic Yang <victoryang@chromium.org> | 2013-05-17 12:21:35 +0800 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-05-17 09:52:25 -0700 |
| commit | ce9d7ca9e9408e22f2bbbe2c72e7df3d5cc1cd43 (patch) | |
| tree | 2353a8af0ec496157d16d16966cf78f732ddbd87 /Makefile.toolchain | |
| parent | 3155af43eb32274b8dc1985d2001ee478d3b99ef (diff) | |
| download | chrome-ec-ce9d7ca9e9408e22f2bbbe2c72e7df3d5cc1cd43.tar.gz | |
Revert "Revert "Scale timer for emulator""
This reverts commit c58c01b14cd45550991be1624146bc813092d202.
Let's add time scaling back, but keep the default scale to 1. The
emulator behavior should be entirely the same. If a test need to be
speeded up, the scale can then be set for that test only.
BUG=chrome-os-partner:19235
TEST=Pass all tests.
BRANCH=None
Change-Id: I648780577a1ae2f964c30c71077ccf9bf38b9735
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/51550
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'Makefile.toolchain')
| -rw-r--r-- | Makefile.toolchain | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain index 82119e5462..2679e2b5f1 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -28,7 +28,8 @@ CFLAGS_DEBUG= -g CFLAGS_INCLUDE=$(foreach i,$(includes),-I$(i) ) CFLAGS_TEST=$(if $(TEST_BUILD),-DTEST_BUILD \ -DTEST_TASKFILE=$(PROJECT).tasklist,) \ - $(if $(EMU_BUILD),-DEMU_BUILD) + $(if $(EMU_BUILD),-DEMU_BUILD) \ + $(if $($(PROJECT)-scale),-DTEST_TIME_SCALE=$($(PROJECT)-scale)) CFLAGS_DEFINE=-DOUTDIR=$(out) -DCHIP=$(CHIP) -DBOARD_TASKFILE=ec.tasklist \ -DBOARD=$(BOARD) -DBOARD_$(BOARD) -DCORE=$(CORE) \ -DCHIP_$(CHIP) -DCHIP_VARIANT=$(CHIP_VARIANT) \ |