diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2017-03-11 04:01:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-11 04:01:29 +0000 |
| commit | c81c2625dbc1d717dfc1f5709f27c8f6418dcd74 (patch) | |
| tree | f2293c4c423edd0a0d5a2f96d0b0017290f61adb /tests | |
| parent | 3c4c29a6259df0da48e14aa6254b6184bd206244 (diff) | |
| parent | 3aa9a925be20727d7f3ddb929ffae8a2dec387d9 (diff) | |
| download | extras-c81c2625dbc1d717dfc1f5709f27c8f6418dcd74.tar.gz | |
Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am: 5b88b5289a am: c2d829fe87
am: 3aa9a925be
Change-Id: Ic888dd5f1249bdcd020a8c5be9d488696fcf971c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fstest/recovery_test.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/fstest/recovery_test.cpp b/tests/fstest/recovery_test.cpp index fab9a0fc..e2371395 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 @@ class FsRecoveryTest : public ::testing::Test { 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) { |