Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
diff --git a/tests/fstest/recovery_test.cpp b/tests/fstest/recovery_test.cpp
index fab9a0f..e237139 100644
--- a/tests/fstest/recovery_test.cpp
+++ b/tests/fstest/recovery_test.cpp
@@ -37,7 +37,6 @@
#include <testUtil.h>
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#define FSTAB_PREFIX "/fstab."
#define SB_OFFSET 1024
static char UMOUNT_BIN[] = "/system/bin/umount";
static char VDC_BIN[] = "/system/bin/vdc";
@@ -188,14 +187,10 @@
bool setCacheInfoFromFstab() {
fs_type = FS_UNKNOWN;
- char propbuf[PROPERTY_VALUE_MAX];
- property_get("ro.hardware", propbuf, "");
- char fstab_filename[PROPERTY_VALUE_MAX + sizeof(FSTAB_PREFIX)];
- snprintf(fstab_filename, sizeof(fstab_filename), FSTAB_PREFIX"%s", propbuf);
- struct fstab *fstab = fs_mgr_read_fstab(fstab_filename);
+ struct fstab *fstab = fs_mgr_read_fstab_default();
if (!fstab) {
- testPrintE("failed to open %s\n", fstab_filename);
+ testPrintE("failed to open default fstab\n");
} else {
// Loop through entries looking for cache.
for (int i = 0; i < fstab->num_entries; ++i) {
