diff options
| author | Vic Yang <victoryang@chromium.org> | 2013-09-01 12:09:06 +0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-09-04 20:32:49 +0000 |
| commit | 04d8465b7550f9752454985f5bcafd3c61da8ee4 (patch) | |
| tree | 1a6414388823d4f58d6e1b43bffa86351f2ec063 | |
| parent | f2046ce3dc510b7c5c2673d291d199cae70fb9d1 (diff) | |
| download | chrome-ec-04d8465b7550f9752454985f5bcafd3c61da8ee4.tar.gz | |
Also test temp sensor read delegation in thermal test
Temperature sensor read is delegated to functions defined in board.c.
Let's mock that function instead of the one in temp_sensor module.
BUG=chrome-os-partner:19236
TEST=Pass thermal test.
BRANCH=None
Change-Id: Ic0387bd6a49e3f032e593c11c6f80bd36f8474e7
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/167761
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | board/host/board.c | 8 | ||||
| -rw-r--r-- | common/temp_sensor.c | 2 | ||||
| -rw-r--r-- | test/thermal.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/board/host/board.c b/board/host/board.c index 4e246fa7a3..cb1ac26577 100644 --- a/board/host/board.c +++ b/board/host/board.c @@ -25,7 +25,7 @@ const struct gpio_alt_func gpio_alt_funcs[] = { }; const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs); -static int dummy_temp_get_val(int idx, int *temp_ptr) +test_mockable_static int dummy_temp_get_val(int idx, int *temp_ptr) { *temp_ptr = 0; return EC_SUCCESS; @@ -33,8 +33,8 @@ static int dummy_temp_get_val(int idx, int *temp_ptr) const struct temp_sensor_t temp_sensors[] = { {"CPU", TEMP_SENSOR_TYPE_CPU, dummy_temp_get_val, 0, 3}, - {"Board", TEMP_SENSOR_TYPE_BOARD, dummy_temp_get_val, 0, 3}, - {"Case", TEMP_SENSOR_TYPE_CASE, dummy_temp_get_val, 0, 0}, - {"Battery", TEMP_SENSOR_TYPE_BOARD, dummy_temp_get_val, 0, 0}, + {"Board", TEMP_SENSOR_TYPE_BOARD, dummy_temp_get_val, 1, 3}, + {"Case", TEMP_SENSOR_TYPE_CASE, dummy_temp_get_val, 2, 0}, + {"Battery", TEMP_SENSOR_TYPE_BOARD, dummy_temp_get_val, 3, 0}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/common/temp_sensor.c b/common/temp_sensor.c index 3b5a59c587..221219bce9 100644 --- a/common/temp_sensor.c +++ b/common/temp_sensor.c @@ -23,7 +23,7 @@ /* Default temperature to report in mapped memory */ #define MAPPED_TEMP_DEFAULT (296 - EC_TEMP_SENSOR_OFFSET) -test_mockable int temp_sensor_read(enum temp_sensor_id id, int *temp_ptr) +int temp_sensor_read(enum temp_sensor_id id, int *temp_ptr) { const struct temp_sensor_t *sensor; diff --git a/test/thermal.c b/test/thermal.c index 7b2e3f9976..fb10b1cd1e 100644 --- a/test/thermal.c +++ b/test/thermal.c @@ -37,10 +37,10 @@ static int cpu_shutdown; static int fan_pct; static int no_temps_read; -int temp_sensor_read(enum temp_sensor_id id, int *temp_ptr) +int dummy_temp_get_val(int idx, int *temp_ptr) { - if (mock_temp[id] >= 0) { - *temp_ptr = mock_temp[id]; + if (mock_temp[idx] >= 0) { + *temp_ptr = mock_temp[idx]; return EC_SUCCESS; } |