Index: client/deps/autox/autox.py |
diff --git a/client/deps/autox/autox.py b/client/deps/autox/autox.py |
index 152472a311274c59c10582c6fc1f2cfaf793b574..54df669582afad9255587e7e7f31a6675d697610 100755 |
--- a/client/deps/autox/autox.py |
+++ b/client/deps/autox/autox.py |
@@ -4,36 +4,17 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-import common, commands, os |
+import common, commands, logging, os |
petkov
2010/02/26 21:59:44
Is common needed?
|
from autotest_lib.client.bin import utils |
version = 1 |
def setup(top_dir): |
- root = commands.getoutput('echo $GCLIENT_ROOT') |
- |
- # Make the debian package first |
- autox_dir = '%s/src/platform/autox' % root |
- os.chdir(autox_dir) |
- utils.system('./make_pkg.sh') |
- os.chdir(top_dir) |
- |
- # TODO(sosa@chromium.org) - Find out a way to figure out whether to use |
- # arm vs. x86 |
- deb_dir = '%s/%s' % (root, 'src/build/x86/local_packages') |
- package_regexp = 'chromeos-autox*' |
- |
- # Get the latest chromeos-autox package |
- find_cmd = 'find %s -name %s | tail -n 1' % (deb_dir, package_regexp) |
- deb_pkg = commands.getoutput(find_cmd) |
- |
- if deb_pkg == '': |
- raise error.TestError('ChromeOS autox package not found') |
- |
- # The path of the dpkg script used to install debian packages |
- dpkg_script = '%s/src/scripts/dpkg_no_scripts.sh' % root |
- |
- utils.system('%s --root %s --unpack %s' % (dpkg_script, top_dir, deb_pkg)) |
+ autox_bin = os.environ['SYSROOT'] + '/usr/bin/autox' |
+ [status, output] = commands.getstatusoutput( |
petkov
2010/02/26 21:59:44
Maybe use shutils.copytree instead?
|
+ 'cp %s %s' % (autox_bin, top_dir)) |
+ if status != 0: |
+ logging.error(output) |
pwd = os.getcwd() |
utils.update_version(pwd + '/src', False, version, setup, pwd) |