diff options
| author | Caroline Tice <cmtice@google.com> | 2016-09-14 11:26:42 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-09-14 15:06:02 -0700 |
| commit | 7248b3f00937ced8385259923aa038fc00d413cb (patch) | |
| tree | 34ca1491d72ec1567b3b7939aa7f9bb3331bb3c0 /binary_search_tool | |
| parent | 6395d39689b42e519aa37c6ac9ca0fedd765b391 (diff) | |
| download | toolchain-utils-7248b3f00937ced8385259923aa038fc00d413cb.tar.gz | |
[bisection] Fix various minor bugs in Android bisection.
Recent testing has found a few minor bugs in the Android
bisection tool. This CL fixes those bugs.
BUG=chromium:646948
TEST=Ran full Android bisection.
Change-Id: I5b228105ec719db89f0ab34b29fde11dbb1e5074
Reviewed-on: https://chrome-internal-review.googlesource.com/287195
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Yunlian Jiang <yunlian@google.com>
Diffstat (limited to 'binary_search_tool')
| -rwxr-xr-x | binary_search_tool/android/setup.sh | 3 | ||||
| -rwxr-xr-x | binary_search_tool/android/test_setup.sh | 6 | ||||
| -rw-r--r-- | binary_search_tool/bisect_driver.py | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/binary_search_tool/android/setup.sh b/binary_search_tool/android/setup.sh index 2ce55e06..7f8ba0e9 100755 --- a/binary_search_tool/android/setup.sh +++ b/binary_search_tool/android/setup.sh @@ -133,6 +133,9 @@ BISECT_GOOD_BUILD=${GOOD_BUILD} BISECT_BAD_BUILD=${BAD_BUILD} BISECT_WORK_BUILD=${WORK_BUILD} +BISECT_GOOD_SET=${GOOD_BUILD}/_LIST +BISECT_BAD_SET=${BAD_BUILD}/_LIST + ${DEVICE_ID} export BISECT_STAGE="TRIAGE" diff --git a/binary_search_tool/android/test_setup.sh b/binary_search_tool/android/test_setup.sh index aacde2fd..985d27f4 100755 --- a/binary_search_tool/android/test_setup.sh +++ b/binary_search_tool/android/test_setup.sh @@ -49,7 +49,7 @@ auto_flash() sleep 1 read -p $'Press enter to continue and retry the flashing' notused - " ${ADB_DEVICE}fastboot flashall -w" + echo " ${ADB_DEVICE}fastboot flashall -w" fastboot flashall -w } @@ -58,8 +58,8 @@ flash() echo echo "FLASHING" echo "Rebooting device into fastboot mode." - echo " ${ADB_DEVICE}adb reboot-bootloader" - adb reboot-bootloader + echo " ${ADB_DEVICE}adb reboot bootloader" + adb reboot bootloader echo echo "Waiting for device to reach fastboot mode." diff --git a/binary_search_tool/bisect_driver.py b/binary_search_tool/bisect_driver.py index d57b6bab..0b3fb1d4 100644 --- a/binary_search_tool/bisect_driver.py +++ b/binary_search_tool/bisect_driver.py @@ -228,9 +228,6 @@ def cache_file(execargs, bisect_dir, cache, abs_file_path): try: if os.path.exists(abs_file_path): shutil.copy2(abs_file_path, bisect_path) - # Set cache object to be read-only so later compilations can't - # accidentally overwrite it. - os.chmod(bisect_path, 0444) except Exception: print('Could not cache file %s' % abs_file_path, file=sys.stderr) raise |