| OLD | NEW |
|---|
| 1 # Copyright 2010 Google Inc. Released under the GPL v2 | 1 # Copyright 2010 Google Inc. Released under the GPL v2 |
| 2 # | 2 # |
| 3 # Eric Li <ericli@google.com> | 3 # Eric Li <ericli@google.com> |
| 4 | 4 |
| 5 import logging, os, pickle, re, sys | 5 import logging, os, pickle, re, sys |
| 6 import common | 6 import common |
| 7 from autotest_lib.client.bin import setup_job as client_setup_job | 7 from autotest_lib.client.bin import setup_job as client_setup_job |
| 8 | 8 |
| 9 | 9 |
| 10 def touch_init(parent_dir, child_dir): | 10 def touch_init(parent_dir, child_dir): |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 """ | 37 """ |
| 38 | 38 |
| 39 class options: | 39 class options: |
| 40 tag = '' | 40 tag = '' |
| 41 verbose = None | 41 verbose = None |
| 42 cont = False | 42 cont = False |
| 43 harness = 'autoserv' | 43 harness = 'autoserv' |
| 44 hostname = None | 44 hostname = None |
| 45 user = None | 45 user = None |
| 46 log = True | 46 log = True |
| 47 tap_report = False |
| 47 return client_setup_job.init_test(options, testdir) | 48 return client_setup_job.init_test(options, testdir) |
| 48 | 49 |
| 49 | 50 |
| 50 def setup(autotest_client_dir, client_test_dir): | 51 def setup(autotest_client_dir, client_test_dir): |
| 51 """ | 52 """ |
| 52 Setup prebuild of a client test. | 53 Setup prebuild of a client test. |
| 53 | 54 |
| 54 @param autotest_client_dir: The autotest/client base directory. | 55 @param autotest_client_dir: The autotest/client base directory. |
| 55 @param client_test_dir: The actual test directory under client. | 56 @param client_test_dir: The actual test directory under client. |
| 56 """ | 57 """ |
| 57 | 58 |
| 58 os.environ['AUTODIR'] = autotest_client_dir | 59 os.environ['AUTODIR'] = autotest_client_dir |
| 59 touch_init(autotest_client_dir, client_test_dir) | 60 touch_init(autotest_client_dir, client_test_dir) |
| 60 | 61 |
| 61 # instantiate a client_test instance. | 62 # instantiate a client_test instance. |
| 62 client_test = init_test(client_test_dir) | 63 client_test = init_test(client_test_dir) |
| 63 client_setup_job.setup_test(client_test) | 64 client_setup_job.setup_test(client_test) |
| 64 | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6246035:
Merge remote branch 'cros/upstream' into master (Closed)
Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master