diff options
| author | Cassidy Burden <cburden@google.com> | 2016-08-11 12:38:29 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-08-18 10:32:20 -0700 |
| commit | 3b0ea76081a892ad757b65db753e739b2362ecd2 (patch) | |
| tree | e6548ab8ecf7bdd6379eb1e20c4e05f164c6bc8a /binary_search_tool | |
| parent | 882e707d7e4f63c8e64fa554e77303c4800258c7 (diff) | |
| download | toolchain-utils-3b0ea76081a892ad757b65db753e739b2362ecd2.tar.gz | |
binary search tool: Update ChromeOS Object bisector
Update ChromeOS Object bisector to work with new compiler wrapper. This
new compiler wrapper means we can now do incremental switches and triage
builds that skip compiler calls.
TEST=Run full bisection
CQ-DEPEND=CL:368231
Change-Id: If34877519ad6dfe3189a5e934e174fd13dae5c89
Reviewed-on: https://chrome-internal-review.googlesource.com/274236
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'binary_search_tool')
| -rwxr-xr-x | binary_search_tool/bisect.py | 2 | ||||
| -rwxr-xr-x | binary_search_tool/sysroot_wrapper/switch_to_bad.sh | 7 | ||||
| -rwxr-xr-x | binary_search_tool/sysroot_wrapper/switch_to_good.sh | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/binary_search_tool/bisect.py b/binary_search_tool/bisect.py index 383fa265..d5a8b710 100755 --- a/binary_search_tool/bisect.py +++ b/binary_search_tool/bisect.py @@ -185,7 +185,7 @@ class BisectObject(Bisector): 'switch_to_bad': 'sysroot_wrapper/switch_to_bad.sh', 'test_setup_script': 'sysroot_wrapper/test_setup.sh', 'test_script': 'sysroot_wrapper/interactive_test.sh', - 'noincremental': True, + 'noincremental': False, 'prune': True, 'file_args': True } diff --git a/binary_search_tool/sysroot_wrapper/switch_to_bad.sh b/binary_search_tool/sysroot_wrapper/switch_to_bad.sh index 7aae3504..32f96780 100755 --- a/binary_search_tool/sysroot_wrapper/switch_to_bad.sh +++ b/binary_search_tool/sysroot_wrapper/switch_to_bad.sh @@ -2,9 +2,8 @@ source common/common.sh -cat $1 > ${bisect_dir}/BAD_SET - -grep -v -x -F -f $1 ${bisect_dir}/GOOD_SET > ${bisect_dir}/GOOD_SET.tmp -mv ${bisect_dir}/GOOD_SET.tmp ${bisect_dir}/GOOD_SET +# Remove file, signaling to emerge that it needs to be rebuilt. The compiler +# wrapper will insert the correct object file based on $BISECT_BAD_SET +cat $1 | sudo xargs rm -f exit 0 diff --git a/binary_search_tool/sysroot_wrapper/switch_to_good.sh b/binary_search_tool/sysroot_wrapper/switch_to_good.sh index 7b3c98c4..f59b278d 100755 --- a/binary_search_tool/sysroot_wrapper/switch_to_good.sh +++ b/binary_search_tool/sysroot_wrapper/switch_to_good.sh @@ -2,9 +2,8 @@ source common/common.sh -cat $1 > ${bisect_dir}/GOOD_SET - -grep -v -x -F -f $1 ${bisect_dir}/BAD_SET > ${bisect_dir}/BAD_SET.tmp -mv ${bisect_dir}/BAD_SET.tmp ${bisect_dir}/BAD_SET +# Remove file, signaling to emerge that it needs to be rebuilt. The compiler +# wrapper will insert the correct object file based on $BISECT_GOOD_SET +cat $1 | sudo xargs rm -f exit 0 |