Chromium Code Reviews| Index: bin/cbuildbot.py |
| diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py |
| index ff3fb8a94c878e42fecd17bc15e008d472842a98..4a25ca6613b9e7f02a321b3e6665e78ea3785a73 100755 |
| --- a/bin/cbuildbot.py |
| +++ b/bin/cbuildbot.py |
| @@ -415,6 +415,22 @@ def _RunSmokeSuite(buildroot, results_dir): |
| ], cwd=cwd, error_ok=False) |
| +def _RunAUTest(buildroot, board): |
| + """Runs a basic update test from the au test harness.""" |
| + cwd = os.path.join(buildroot, 'src', 'scripts') |
| + image_path = os.path.join(buildroot, 'src', 'build', 'images', board, |
| + 'latest', 'chromiumos_test_image.bin') |
| + RunCommand(['bin/cros_au_test_harness', |
| + '--no_graphics', |
| + '--no_delta', |
| + '--board=%s' % board, |
| + '--test_prefix=SimpleTest', |
| + '--verbose', |
| + '--base_image=%s' % image_path, |
| + '--target_image=%s' % image_path, |
| + ], cwd=cwd, error_ok=False) |
| + |
| + |
| def _UprevPackages(buildroot, tracking_branch, revisionfile, board, overlays): |
| """Uprevs a package based on given revisionfile. |
| @@ -684,26 +700,28 @@ def main(): |
| return |
| elif buildconfig['uprev']: |
| - _UprevPackages(buildroot, tracking_branch, revisionfile, |
| - buildconfig['board'], rev_overlays) |
| + #_UprevPackages(buildroot, tracking_branch, revisionfile, |
|
petkov
2011/01/07 22:17:29
why is this code commented out? remove? there's mo
sosa
2011/01/07 23:28:44
Done.
|
| + # buildconfig['board'], rev_overlays) |
| + pass |
| _EnableLocalAccount(buildroot) |
| - _Build(buildroot, emptytree) |
| + #_Build(buildroot, emptytree) |
| - if buildconfig['unittests'] and options.tests: |
| - _RunUnitTests(buildroot) |
| + #if buildconfig['unittests'] and options.tests: |
| + # _RunUnitTests(buildroot) |
| - _BuildImage(buildroot) |
| + #_BuildImage(buildroot) |
| - if buildconfig['smoke_bvt'] and options.tests: |
| + if buildconfig['tests'] and options.tests: |
| _BuildVMImageForTesting(buildroot) |
| test_results_dir = '/tmp/run_remote_tests.%s' % options.buildnumber |
| try: |
| - _RunSmokeSuite(buildroot, test_results_dir) |
| + #_RunSmokeSuite(buildroot, test_results_dir) |
| + _RunAUTest(buildroot, buildconfig['board']) |
| finally: |
| if not options.debug: |
| archive_full_path = os.path.join(options.gsutil_archive, |
| - str(options.buildnumber)) |
| + str(options.buildnumber)) |
| _ArchiveTestResults(buildroot, buildconfig['board'], |
| test_results_dir=test_results_dir, |
| gsutil=options.gsutil, |