From ca948564168a597c2d51a26555e327001f7eecc4 Mon Sep 17 00:00:00 2001
From: Tianjie Xu <xunchang@google.com>
Date: Tue, 28 Feb 2017 12:26:29 -0800
Subject: Skip BootloaderMessageTest, UncryptTest for devices without /misc

Skip these two tests if /misc partition is not found in fstab.

Bug: 35712836
Test: Both test skip correctly if there's no /misc in fstab.${hardware}.
Change-Id: I38417a8677030229a335e43eaef85ae70c4e0845
---
 tests/common/component_test_util.h | 50 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 tests/common/component_test_util.h

(limited to 'tests/common/component_test_util.h')

diff --git a/tests/common/component_test_util.h b/tests/common/component_test_util.h
new file mode 100644
index 000000000..44322972b
--- /dev/null
+++ b/tests/common/component_test_util.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agree to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _COMPONENT_TEST_UTIL_H
+#define _COMPONENT_TEST_UTIL_H
+
+#include <string>
+
+#include <android-base/properties.h>
+#include <fs_mgr.h>
+
+// Check if the /misc entry exists in the fstab.
+static bool parse_misc() {
+  // The fstab path is "/fstab.${ro.hardware}".
+  std::string ro_hardware = android::base::GetProperty("ro.hardware", "");
+  if (ro_hardware.empty()) {
+    GTEST_LOG_(INFO) << "Failed to get ro.hardware.";
+    return false;
+  }
+
+  std::string fstab_path = "/fstab." + ro_hardware;
+  fstab* fstab = fs_mgr_read_fstab(fstab_path.c_str());
+  if (fstab == nullptr) {
+    GTEST_LOG_(INFO) << "Failed to read " << fstab_path;
+    return false;
+  }
+
+  fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab, "/misc");
+  if (record == nullptr) {
+    GTEST_LOG_(INFO) << "Failed to find /misc in fstab.";
+    return false;
+  }
+  return true;
+}
+
+#endif //_COMPONENT_TEST_UTIL_H
+
-- 
cgit v1.2.3


From d13b6cf29c71412adac3b0dca5eddcd6c75f5163 Mon Sep 17 00:00:00 2001
From: Bowgo Tsai <bowgotsai@google.com>
Date: Fri, 10 Mar 2017 16:00:40 +0800
Subject: recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs

The fstab settings of early-mounted partitions (e.g., /vendor) will be in
kernel device tree. Switch to the new API to get the whole settings with
those in device tree:

    fs_mgr_read_fstab_with_dt("/etc/recovery.fstab")

The original default /fstab.{ro.hardware} might be moved to
/vendor/etc/. or /odm/etc/. Use another new API to get the default fstab
instead of using the hard-coded /fstab.{ro.hardware}. This API also
includes the settings from device tree:

    fs_mgr_read_fstab_default()

Bug: 35811655
Test: boot sailfish recovery
Change-Id: Iaa56ac7f7b4c4dfc7180c65f03e9a37b94f1de09
---
 tests/common/component_test_util.h | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'tests/common/component_test_util.h')

diff --git a/tests/common/component_test_util.h b/tests/common/component_test_util.h
index 44322972b..3fee32d62 100644
--- a/tests/common/component_test_util.h
+++ b/tests/common/component_test_util.h
@@ -24,21 +24,14 @@
 
 // Check if the /misc entry exists in the fstab.
 static bool parse_misc() {
-  // The fstab path is "/fstab.${ro.hardware}".
-  std::string ro_hardware = android::base::GetProperty("ro.hardware", "");
-  if (ro_hardware.empty()) {
-    GTEST_LOG_(INFO) << "Failed to get ro.hardware.";
+  std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(),
+                                                             fs_mgr_free_fstab);
+  if (!fstab) {
+    GTEST_LOG_(INFO) << "Failed to read default fstab";
     return false;
   }
 
-  std::string fstab_path = "/fstab." + ro_hardware;
-  fstab* fstab = fs_mgr_read_fstab(fstab_path.c_str());
-  if (fstab == nullptr) {
-    GTEST_LOG_(INFO) << "Failed to read " << fstab_path;
-    return false;
-  }
-
-  fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab, "/misc");
+  fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab.get(), "/misc");
   if (record == nullptr) {
     GTEST_LOG_(INFO) << "Failed to find /misc in fstab.";
     return false;
-- 
cgit v1.2.3