From e4d6f134eca0fbf5a53703c60797a397fb158091 Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Tue, 30 Aug 2016 14:09:47 -0700 Subject: [PATCH] test: Properly exclude CONFIG_POWER_TRACK_HOST_SLEEP_STATE CONFIG_POWER_TRACK_HOST_SLEEP_STATE has a dependency on CONFIG_POWER_COMMON, so remove it from test builds that don't have a chipset task, rather than heavy-handedly removing it from all test builds. BUG=chrome-os-partner:56197 BRANCH=None TEST=`make BOARD=gru tests` Change-Id: I86e20b4dccbb01ee285054a47093d6f60abc2166 Signed-off-by: Shawn Nematbakhsh Reviewed-on: https://chromium-review.googlesource.com/378119 Commit-Ready: Shawn N Tested-by: Shawn N Reviewed-by: Aseda Aboagye --- include/config.h | 1 + test/test_config.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config.h b/include/config.h index 7762dca120..f50602d2df 100644 --- a/include/config.h +++ b/include/config.h @@ -2367,6 +2367,7 @@ #undef CONFIG_CHIPSET_SKYLAKE #undef CONFIG_CHIPSET_TEGRA #undef CONFIG_POWER_COMMON +#undef CONFIG_POWER_TRACK_HOST_SLEEP_STATE #endif #ifndef HAS_TASK_KEYPROTO diff --git a/test/test_config.h b/test/test_config.h index 30369e7207..d04708f617 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -14,7 +14,6 @@ /* Don't compile features unless specifically testing for them */ #undef CONFIG_VBOOT_HASH #undef CONFIG_USB_PD_LOGGING -#undef CONFIG_POWER_TRACK_HOST_SLEEP_STATE #ifdef TEST_BKLIGHT_LID #define CONFIG_BACKLIGHT_LID