Gitiles
Code Review Sign In
gerrit.twrp.me / android_bootable_recovery / ec9706738f35a859f66fd0758b73381055804f63
commitec9706738f35a859f66fd0758b73381055804f63[log] [tgz]
authorTao Bao <tbao@google.com>Wed May 03 11:00:48 2017 -0700
committerTao Bao <tbao@google.com>Wed May 03 11:26:00 2017 -0700
tree1a3293313d04f5f9e7432ee5d13344b22a3fbefd
parent89394632b1241f6f4ef9399e3f6fe7d2cc2eaf15 [diff]
Remove EXPAND/STRINGIFY macros.

They are error-prone by putting anything into a string (e.g.
EXPAND(RECOVERY_API_VERSION) would become "RECOVER_API_VERSION" if we
forgot to pass -DRECOVERY_API_VERSION=3).

RECOVERY_API_VERSION is the only user (in bootable/recovery) that gets
stringified. Assign it to a typed var and sanity check the value.

Don't see other reference to the macros from device-specific recovery
directories (they can still define that locally if really needed).

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