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

Side by Side Diff: frontend/tko/common.py

Issue 6246035: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 import os, sys 1 import os, sys
2 dirname = os.path.dirname(sys.modules[__name__].__file__) 2 dirname = os.path.dirname(sys.modules[__name__].__file__)
3 autotest_dir = os.path.abspath(os.path.join(dirname, '..', '..')) 3 autotest_dir = os.path.abspath(os.path.join(dirname, '..', '..'))
4 client_dir = os.path.join(autotest_dir, "client") 4 client_dir = os.path.join(autotest_dir, "client")
5 sys.path.insert(0, client_dir) 5 sys.path.insert(0, client_dir)
6 import setup_modules 6 import setup_modules
7 sys.path.pop(0) 7 sys.path.pop(0)
8 setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib") 8 setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib")
9 import os, sys
10 dirname = os.path.dirname(sys.modules[__name__].__file__)
11 autotest_dir = os.path.abspath(os.path.join(dirname, '..', '..'))
12 client_dir = os.path.join(autotest_dir, "client")
13 sys.path.insert(0, client_dir)
14 import setup_modules
15 sys.path.pop(0)
16 setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib")
17 import os, sys
18 dirname = os.path.dirname(sys.modules[__name__].__file__)
19 autotest_dir = os.path.abspath(os.path.join(dirname, '..', '..'))
20 client_dir = os.path.join(autotest_dir, "client")
21 sys.path.insert(0, client_dir)
22 import setup_modules
23 sys.path.pop(0)
24 setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib")
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698