They are error-prone by putting anything into a string (e.g.
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. .clang-format
  23. adb_install.cpp
  24. adb_install.h
  26. asn1_decoder.cpp
  27. asn1_decoder.h
  28. bootloader.h
  30. common.h
  31. default_device.cpp
  32. device.cpp
  33. device.h
  34. error_code.h
  35. fuse_sdcard_provider.cpp
  36. fuse_sdcard_provider.h
  37. fuse_sideload.cpp
  38. fuse_sideload.h
  39. install.cpp
  40. install.h
  42. mounts.cpp
  43. mounts.h
  44. NOTICE
  45. print_sha1.h
  47. recovery-persist.cpp
  48. recovery-persist.rc
  49. recovery-refresh.cpp
  50. recovery-refresh.rc
  51. recovery.cpp
  52. roots.cpp
  53. roots.h
  54. rotate_logs.cpp
  55. rotate_logs.h
  56. screen_ui.cpp
  57. screen_ui.h
  58. stub_ui.h
  59. ui.cpp
  60. ui.h
  61. verifier.cpp
  62. verifier.h
  63. wear_touch.cpp
  64. wear_touch.h
  65. wear_ui.cpp
  66. wear_ui.h

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.