diff options
author | Tianjie Xu <xunchang@google.com> | 2017-10-25 13:16:54 -0700 |
---|---|---|
committer | Tianjie Xu <xunchang@google.com> | 2017-11-03 14:09:11 -0700 |
commit | a88cc5440ed79a0927f57bbd03377ff3ce04a760 (patch) | |
tree | 493507d15c2ec159ee74a3e21a0cee91bee58d28 /applypatch/freecache.cpp | |
parent | 43f194c8bc383fdda40505813db98c9f7860417b (diff) | |
download | android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.tar.gz android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.tar.bz2 android_bootable_recovery-a88cc5440ed79a0927f57bbd03377ff3ce04a760.zip |
Switch to bionic gtest in bootable/recovery
We encountered segfaults in Imgdiff host tests due to the failure to
reset states of getopt. The problem can be solved by switching to use
bionic's gtest where a new process is forked for each test.
Also modify the recovery_component_test to make sure it runs in parallel.
Changes include:
1. Merge the writes to misc partition into one single test.
2. Change the hard coded location "/cache/saved.file" into a configurable
variable.
Bug: 67849209
Test: recovery tests pass
Change-Id: I165d313f32b83393fb7922c5078636ac40b50bc2
Diffstat (limited to 'applypatch/freecache.cpp')
-rw-r--r-- | applypatch/freecache.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/applypatch/freecache.cpp b/applypatch/freecache.cpp index 331cae26..0a40baa9 100644 --- a/applypatch/freecache.cpp +++ b/applypatch/freecache.cpp @@ -90,10 +90,9 @@ static std::set<std::string> FindExpendableFiles() { while ((de = readdir(d.get())) != 0) { std::string path = std::string(dirs[i]) + "/" + de->d_name; - // We can't delete CACHE_TEMP_SOURCE; if it's there we might have - // restarted during installation and could be depending on it to - // be there. - if (path == CACHE_TEMP_SOURCE) { + // We can't delete cache_temp_source; if it's there we might have restarted during + // installation and could be depending on it to be there. + if (path == cache_temp_source) { continue; } |