Gitiles
Code Review Sign In
gerrit.twrp.me / android_bootable_recovery / 8f23757ad42352f57db0b2ab9fc8b6e92eeaedd9
commit8f23757ad42352f57db0b2ab9fc8b6e92eeaedd9[log] [tgz]
authorTao Bao <tbao@google.com>Sun Mar 26 13:36:49 2017 -0700
committerTao Bao <tbao@google.com>Fri Mar 31 00:04:56 2017 -0700
treef94a9b955c8a64f112db44dbcc96f2fd6c2d2d6e
parent65c065b4bb5c3951da33a7bea2eaea00d30af079 [diff]
Move parse_range() and range_overlaps() into RangeSet.

Also move RangeSet into a header file to make it testable, and add unit
tests.

In RangeSet::Parse() (the former parse_range()), use libbase logging to
do assertions. This has the same effect as the previous
exit(EXIT_FAILURE) to terminate the updater process and abort an update.
The difference lies in the exit status code (i.e. WEXITSTATUS(status) in
install.cpp), which changes from 1 (i.e. EXIT_FAILURE) to 0.

Test: recovery_unit_test
Test: Apply an incremental update with the new updater.
Change-Id: Ie8393c78b0d8ae0fd5f0ca0646d871308d71fff0
4 files changed
tree: f94a9b955c8a64f112db44dbcc96f2fd6c2d2d6e
  1. applypatch/
  2. bootloader_message/
  3. edify/
  4. etc/
  5. fonts/
  6. minadbd/
  7. minui/
  8. otafault/
  9. otautil/
  10. res-hdpi/
  11. res-mdpi/
  12. res-xhdpi/
  13. res-xxhdpi/
  14. res-xxxhdpi/
  15. tests/
  16. tools/
  17. uncrypt/
  18. update_verifier/
  19. updater/
  20. res-560dpi ⇨ res-xxxhdpi
  21. .clang-format
  22. adb_install.cpp
  23. adb_install.h
  24. Android.mk
  25. asn1_decoder.cpp
  26. asn1_decoder.h
  27. bootloader.h
  28. CleanSpec.mk
  29. common.h
  30. default_device.cpp
  31. device.cpp
  32. device.h
  33. error_code.h
  34. fuse_sdcard_provider.cpp
  35. fuse_sdcard_provider.h
  36. fuse_sideload.cpp
  37. fuse_sideload.h
  38. install.cpp
  39. install.h
  40. interlace-frames.py
  41. mounts.cpp
  42. mounts.h
  43. NOTICE
  44. print_sha1.h
  45. README.md
  46. recovery-persist.cpp
  47. recovery-persist.rc
  48. recovery-refresh.cpp
  49. recovery-refresh.rc
  50. recovery.cpp
  51. roots.cpp
  52. roots.h
  53. rotate_logs.cpp
  54. rotate_logs.h
  55. screen_ui.cpp
  56. screen_ui.h
  57. stub_ui.h
  58. ui.cpp
  59. ui.h
  60. verifier.cpp
  61. verifier.h
  62. wear_touch.cpp
  63. wear_touch.h
  64. wear_ui.cpp
  65. wear_ui.h
README.md

The Recovery Image

Quick turn-around testing

mm -j && m ramdisk-nodeps && m recoveryimage-nodeps

# To boot into the new recovery image
# without flashing the recovery partition:
adb reboot bootloader
fastboot boot $ANDROID_PRODUCT_OUT/recovery.img

Running the tests

# After setting up environment and lunch.
mmma -j bootable/recovery

# Running the tests on device.
adb root
adb sync data

# 32-bit device
adb shell /data/nativetest/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest/recovery_component_test/recovery_component_test

# Or 64-bit device
adb shell /data/nativetest64/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest64/recovery_component_test/recovery_component_test

Running the manual tests

recovery-refresh and recovery-persist executables exist only on systems without /cache partition. And we need to follow special steps to run tests for them.

  • Execute the test on an A/B device first. The test should fail but it will log some contents to pmsg.

  • Reboot the device immediately and run the test again. The test should save the contents of pmsg buffer into /data/misc/recovery/inject.txt. Test will pass if this file has expected contents.

ResourceTest validates whether the png files are qualified as background text image under recovery.

1. `adb sync data` to make sure the test-dir has the images to test.
2. The test will automatically pickup and verify all `_text.png` files in
   the test dir.