Google Git
Sign in
chromium / chromiumos / third_party / toolchain-utils / refs/heads/firmware-12573.191.B
commit8acdba62d56696f53b5be7fca5506d1f2357eae4[log] [tgz]
authorGeorge Burgess IV <gbiv@google.com>Fri Oct 04 21:43:37 2019
committerGeorge Burgess <gbiv@chromium.org>Fri Oct 04 21:58:22 2019
treeb403ed7d84f2c85c59d60cefb47de746f65c3000
parentf723413d259ff1997fefc51f9c358f4e3e2ecfd0 [diff]
Add a merge-with-upstream script to toolchain-utils

Android wants to pull toolchain-utils more often. In order to make this
easier, let's have a script to do it.

BUG=None
TEST=The CL linked in the patch. Tried a few fun tricks to cover the
conditional logic, too.

Change-Id: If8de867b3711bf33309db7c64dc5b67e51e36423
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1841586
Reviewed-by: Stephen Hines <srhines@google.com>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>
1 file changed
tree: b403ed7d84f2c85c59d60cefb47de746f65c3000
  1. afdo_metadata/
  2. afdo_redaction/
  3. afdo_tools/
  4. android_bench_suite/
  5. automation/
  6. bestflags/
  7. binary_search_tool/
  8. build-binutils/
  9. build-gcc/
  10. compiler_wrapper/
  11. crb/
  12. cros_utils/
  13. crosperf/
  14. cwp/
  15. debug_info_test/
  16. dejagnu/
  17. deprecated/
  18. fdo_scripts/
  19. go/
  20. heatmaps/
  21. llvm_extra/
  22. llvm_tools/
  23. mem_tests/
  24. orderfile/
  25. pgo_tools/
  26. toolchain_utils_githooks/
  27. .gitignore
  28. .style.yapf
  29. afe_lock_machine.py
  30. android_merge_from_upstream.sh
  31. auto_delete_nightly_test_data.py
  32. build_chrome_browser.py
  33. build_chromeos.py
  34. build_tc.py
  35. build_tool.py
  36. buildbot_test_llvm.py
  37. buildbot_test_toolchains.py
  38. chromiumos_image_diff.py
  39. command_executer_timeout_test.py
  40. COMMIT-QUEUE.ini
  41. compiler-test.sh
  42. cros_login.py
  43. file_lock_machine.py
  44. generate-waterfall-reports.py
  45. get_common_image_version.py
  46. image_chromeos.py
  47. LICENSE
  48. lock_machine_test.py
  49. new-generate-waterfall-reports.py
  50. OWNERS
  51. OWNERS.toolchain
  52. PRESUBMIT.cfg
  53. produce_output.py
  54. pyrun
  55. README.chromium
  56. README.md
  57. remote_gcc_build.py
  58. remote_kill_test.py
  59. remote_test.py
  60. repo_to_repo.py
  61. run_tests_for.py
  62. setup_chromeos.py
  63. tc_enter_chroot.py
  64. test_gcc_dejagnu.py
  65. test_gdb_dejagnu.py
  66. test_toolchains.py
  67. update_telemetry_defaults.py
  68. verify_compiler.py
  69. weekly_report.py
README.md

toolchain-utils

Various utilities used by the Chrome OS toolchain team.

Note

To run Python scripts in this directory, first run:

export PYTHONPATH=$(readlink -f .):$PYTHONPATH

from this directory.

Then you can run any script.

To get help on any script, type in python <script> --help, or refer to the header of the script for more information.