aboutsummaryrefslogtreecommitdiff
path: root/binary_search_tool/bisect.py
diff options
context:
space:
mode:
authorCassidy Burden <cburden@google.com>2016-06-22 17:01:04 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-06-24 10:52:49 -0700
commit545b947888df1d07f4ad530e1c5eec930fc283c2 (patch)
tree14ef0fcac7830f13527caf3368668f48faa8fc23 /binary_search_tool/bisect.py
parent58f24cae7e6dfed8196d0b96713afaa42cd1fdde (diff)
downloadtoolchain-utils-545b947888df1d07f4ad530e1c5eec930fc283c2.tar.gz
binary search tool: Move root path of cros_pkg execution, rename scripts
Update cros_pkg scripts and bisect.py so that the package bisector needs to be run from binary_search_tool/ instead of binary_search_tool/cros_pkg. This fits with how sysroot_wrapper implements its scripts. Also rename all cros_pkg scripts to remove cros_pkg prefix and remove undo_eclean.py. TEST=Run unit tests and run interactive/testing cros_pkg test Change-Id: I2781319934b704b91346745ae2d4d916fee35d02 Reviewed-on: https://chrome-internal-review.googlesource.com/266365 Commit-Ready: Cassidy Burden <cburden@google.com> Tested-by: Cassidy Burden <cburden@google.com> Reviewed-by: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'binary_search_tool/bisect.py')
-rwxr-xr-xbinary_search_tool/bisect.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/binary_search_tool/bisect.py b/binary_search_tool/bisect.py
index 06be35fc..e8bd5ec7 100755
--- a/binary_search_tool/bisect.py
+++ b/binary_search_tool/bisect.py
@@ -49,14 +49,14 @@ class Bisector(object):
class BisectPackage(Bisector):
"""The class for package bisection steps."""
- cros_pkg_setup = './cros_pkg_setup.sh'
- cros_pkg_cleanup = './cros_pkg_%s_cleanup.sh'
+ cros_pkg_setup = 'cros_pkg/setup.sh'
+ cros_pkg_cleanup = 'cros_pkg/%s_cleanup.sh'
default_kwargs = {
- 'get_initial_items': './cros_pkg_get_initial_items.sh',
- 'switch_to_good': './cros_pkg_switch_to_good.sh',
- 'switch_to_bad': './cros_pkg_switch_to_bad.sh',
- 'install_script': './cros_pkg_install.sh',
- 'test_script': './cros_pkg_interactive_test.sh',
+ 'get_initial_items': 'cros_pkg/get_initial_items.sh',
+ 'switch_to_good': 'cros_pkg/switch_to_good.sh',
+ 'switch_to_bad': 'cros_pkg/switch_to_bad.sh',
+ 'install_script': 'cros_pkg/install.sh',
+ 'test_script': 'cros_pkg/interactive_test.sh',
'noincremental': False,
'prune': True,
'file_args': True
@@ -66,7 +66,6 @@ class BisectPackage(Bisector):
super(BisectPackage, self).__init__(options)
def PreRun(self):
- os.chdir('./cros_pkg')
cmd = ('%s %s %s' %
(self.cros_pkg_setup, self.options.board, self.options.remote))
ret, _, _ = self.ce.RunCommandWExceptionCleanup(cmd, print_to_console=True)