aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2023-10-11 13:26:23 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-10-21 00:07:02 +0000
commit478ccef2db3fa071619696d030f0aaf049aad2c5 (patch)
tree68a01ca09309b1c6973d87e2ff1b291a2e21a63f
parenta41d12f560e887c7ef3b24a830a7707ad3210a0f (diff)
downloadupdate_engine-478ccef2db3fa071619696d030f0aaf049aad2c5.tar.gz
update_engine: Omit test LVM when LVM is not compiled in
On board where device-mapper USE flag is not set (and by extension) lvm_stateful_partition is not set, do not run related tests. The code will never be called and prevent an emerge failure. BUG=b:262166536 TEST=CQ. TEST=FEATURES=test emerge-viking update_engine Cq-Depend: chromium:4945452 Change-Id: I60e39e53bf512f90538e8aee139e51c7dccf2ecb Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/4930209 Tested-by: Gwendal Grignou <gwendal@chromium.org> Commit-Queue: Gwendal Grignou <gwendal@chromium.org> Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
-rw-r--r--cros/boot_control_chromeos_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/cros/boot_control_chromeos_unittest.cc b/cros/boot_control_chromeos_unittest.cc
index 55c9853f..69fcfa6a 100644
--- a/cros/boot_control_chromeos_unittest.cc
+++ b/cros/boot_control_chromeos_unittest.cc
@@ -154,6 +154,7 @@ TEST_F(BootControlChromeOSTest, GetMiniOSVersionTest) {
EXPECT_FALSE(bootctl_.GetMiniOSVersion(output, &value));
}
+#if USE_LVM_STATEFUL_PARTITION
TEST_F(BootControlChromeOSTest, IsLvmStackEnabledTest) {
std::optional<brillo::PhysicalVolume> opt;
opt = brillo::PhysicalVolume(base::FilePath("/foo/bar"), nullptr);
@@ -175,5 +176,6 @@ TEST_F(BootControlChromeOSTest, IsLvmStackEnabledInvalidPhysicalVolumeTest) {
// Check caching too.
EXPECT_FALSE(bootctl_.IsLvmStackEnabled(&mock_lvm));
}
+#endif // USE_LVM_STATEFUL_PARTITION
} // namespace chromeos_update_engine