Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1007)

Unified Diff: client/deps/chrome_test/chrome_test.py

Issue 669112: Fixed buildbreak for non-local chrome builds. (Closed)
Patch Set: Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/deps/chrome_test/chrome_test.py
diff --git a/client/deps/chrome_test/chrome_test.py b/client/deps/chrome_test/chrome_test.py
index 411a7ae73b928195103dd86f45a8be9288fbca4c..a876836bd39ba220acb9ad778d64ebb807844d05 100755
--- a/client/deps/chrome_test/chrome_test.py
+++ b/client/deps/chrome_test/chrome_test.py
@@ -10,12 +10,17 @@ from autotest_lib.client.bin import utils
version = 1
def setup(top_dir):
+ if os.environ['CHROME_ORIGIN'] != 'LOCAL_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 -r %s %s' % (chrome_test_files, testsrc_dir))
+
pwd = os.getcwd()
utils.update_version(pwd + '/src', False, version, setup, pwd)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698