diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 18:20:48 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 18:20:48 +0000 |
| commit | 8c350eab49062665fd2386e1a6ede82b4ecd3574 (patch) | |
| tree | 3105e7e39b62baa6d99bcad1b846e6e173ce6529 /chrome/test/chromeos | |
| parent | 4b65d2833244db6625daf107e30b75bbd60a4a7b (diff) | |
| download | chromium_src-8c350eab49062665fd2386e1a6ede82b4ecd3574.zip chromium_src-8c350eab49062665fd2386e1a6ede82b4ecd3574.tar.gz chromium_src-8c350eab49062665fd2386e1a6ede82b4ecd3574.tar.bz2 | |
Removed unnecessary setup for chrome test dependencies.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3257006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chromeos')
| -rwxr-xr-x[-rw-r--r--] | chrome/test/chromeos/autotest/files/client/deps/chrome_test/chrome_test.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chrome/test/chromeos/autotest/files/client/deps/chrome_test/chrome_test.py b/chrome/test/chromeos/autotest/files/client/deps/chrome_test/chrome_test.py index a535cfa..752683d 100644..100755 --- a/chrome/test/chromeos/autotest/files/client/deps/chrome_test/chrome_test.py +++ b/chrome/test/chromeos/autotest/files/client/deps/chrome_test/chrome_test.py @@ -10,19 +10,8 @@ from autotest_lib.client.bin import utils version = 1 def setup(top_dir): - if 'CHROME_ORIGIN' not in os.environ.keys() or \ - (os.environ['CHROME_ORIGIN'] != 'LOCAL_SOURCE' and - os.environ['CHROME_ORIGIN'] != 'SERVER_SOURCE'): - logging.info('Skipping Chrome test resource setup for non-local builds') - return - - chrome_test_files = os.environ['SYSROOT'] + '/usr/local/autotest-chrome' - logging.info('Configuring chrome test resources in %s' % top_dir) - testsrc_dir = top_dir + '/test_src' - - # Copy test build outputs. - utils.run('cp -ral %s %s' % (chrome_test_files, testsrc_dir)) + return pwd = os.getcwd() -utils.update_version(pwd + '/src', False, version, setup, pwd) +utils.update_version(pwd + '/src', False, version, setup, None) |