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

Unified Diff: client/tools/autotest

Issue 6539001: Merge remote branch 'cros/upstream' into master. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 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 | « client/tests/wb_kupdate/wb_kupdate_unittest.py ('k') | database/schema_051.sql » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tools/autotest
diff --git a/client/tools/autotest b/client/tools/autotest
index 13fe1cc9dca7d4f6da432cf5de10433b82b5efe1..8fae3f4005364a81d7b0ee2ab281ecd75d1ac8e3 100755
--- a/client/tools/autotest
+++ b/client/tools/autotest
@@ -6,7 +6,6 @@ autotest_conf = os.path.realpath('/etc/autotest.conf')
if os.path.isfile(autotest_conf):
autodir = os.path.dirname(autotest_conf)
-
if not autodir:
for path in ['/usr/local/autotest', '/home/autotest']:
if os.path.exists(os.path.join(path, 'bin/autotest')):
« no previous file with comments | « client/tests/wb_kupdate/wb_kupdate_unittest.py ('k') | database/schema_051.sql » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698