From c87e426d43b33ab74ccc723bb2750d6d013e72ff Mon Sep 17 00:00:00 2001 From: "tkent@chromium.org" Date: Thu, 29 Aug 2013 05:15:30 +0000 Subject: [PATCH] Revert 220166 "Archive webkit_tests results on android bots if r..." Android bot throws an exception since this change. < cat /b/build/slave/WebKit_Android__Nexus4_/build/src/out/Release/test_logs/unit_test.log An instance of host heart beart running... will kill Traceback (most recent call last): File "build/android/buildbot/bb_device_steps.py", line 469, in sys.exit(main(sys.argv)) File "build/android/buildbot/bb_device_steps.py", line 465, in main MainTestWrapper(options) File "build/android/buildbot/bb_device_steps.py", line 402, in MainTestWrapper bb_utils.RunSteps(options.test_filter, GetTestStepCmds(), options) File "/b/build/slave/WebKit_Android__Nexus4_/build/src/build/android/buildbot/bb_utils.py", line 97, in RunSteps cmd(options) File "build/android/buildbot/bb_device_steps.py", line 257, in RunWebkitLayoutTests '--builder-name', options.build_properties.get('buildername', '')]) File "/b/build/slave/WebKit_Android__Nexus4_/build/src/build/android/buildbot/bb_utils.py", line 56, in RunCmd code = SpawnCmd(command, stdout, cwd).wait() File "/b/build/slave/WebKit_Android__Nexus4_/build/src/build/android/buildbot/bb_utils.py", line 49, in SpawnCmd return subprocess.Popen(command, cwd=cwd, stdout=stdout) File "/usr/lib/python2.7/subprocess.py", line 679, in __init__ errread, errwrite) File "/usr/lib/python2.7/subprocess.py", line 1249, in _execute_child raise child_exception OSError: [Errno 2] No such file or directory > Archive webkit_tests results on android bots if requested. > > R=ilevy@chromium.org, bulach@chromium.org, peter@chromium.org > BUG=276076 > > Review URL: https://chromiumcodereview.appspot.com/22825016 TBR=dpranke@chromium.org Review URL: https://codereview.chromium.org/23601007 git-svn-id: http://src.chromium.org/svn/trunk/src/build@220210 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- android/buildbot/bb_device_steps.py | 36 ++++++++++------------------- android/buildbot/bb_utils.py | 3 --- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/android/buildbot/bb_device_steps.py b/android/buildbot/bb_device_steps.py index ded4bb79a..b8a1b84a0 100755 --- a/android/buildbot/bb_device_steps.py +++ b/android/buildbot/bb_device_steps.py @@ -21,15 +21,13 @@ from pylib import android_commands from pylib import constants from pylib.gtest import gtest_config -CHROME_SRC_DIR = bb_utils.CHROME_SRC -CHROME_OUT_DIR = bb_utils.CHROME_OUT_DIR sys.path.append(os.path.join( - CHROME_SRC_DIR, 'third_party', 'android_testrunner')) + constants.DIR_SOURCE_ROOT, 'third_party', 'android_testrunner')) import errors -SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave') -LOGCAT_DIR = os.path.join(bb_utils.CHROME_OUT_DIR, 'logcat') +CHROME_SRC = constants.DIR_SOURCE_ROOT +LOGCAT_DIR = os.path.join(CHROME_SRC, 'out', 'logcat') # Describes an instrumation test suite: # test: Name of test we're running. @@ -222,7 +220,7 @@ def RunWebkitLayoutTests(options): '--exit-after-n-failures', '5000', '--exit-after-n-crashes-or-timeouts', '100', '--debug-rwt-logging', - '--results-directory', '../layout-test-results', + '--results-directory', '..layout-test-results', '--target', options.target, '--builder-name', options.build_properties.get('buildername', ''), '--build-number', str(options.build_properties.get('buildnumber', '')), @@ -237,30 +235,21 @@ def RunWebkitLayoutTests(options): for f in options.factory_properties.get('additional_expectations', []): cmd_args.extend( - ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) + ['--additional-expectations=%s' % os.path.join(CHROME_SRC, *f)]) # TODO(dpranke): Remove this block after # https://codereview.chromium.org/12927002/ lands. for f in options.factory_properties.get('additional_expectations_files', []): cmd_args.extend( - ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) + ['--additional-expectations=%s' % os.path.join(CHROME_SRC, *f)]) RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args) - if options.factory_properties.get('archive_webkit_results', False): - bb_annotations.PrintNamedStep('archive_webkit_results') - RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'archive_layout_test_results.py'), - '--results-dir', '../layout-test-results', - '--target', options.target, - '--build-dir', CHROME_OUT_DIR, - '--build-number', str(options.build_properties.get('buildnumber', '')), - '--builder-name', options.build_properties.get('buildername', '')]) - def SpawnLogcatMonitor(): shutil.rmtree(LOGCAT_DIR, ignore_errors=True) bb_utils.SpawnCmd([ - os.path.join(CHROME_SRC_DIR, 'build', 'android', 'adb_logcat_monitor.py'), + os.path.join(CHROME_SRC, 'build', 'android', 'adb_logcat_monitor.py'), LOGCAT_DIR]) # Wait for logcat_monitor to pull existing logcat @@ -359,7 +348,7 @@ def GenerateJavaCoverageReport(options): coverage_html = os.path.join(options.coverage_dir, 'coverage_html') RunCmd(['build/android/generate_emma_html.py', '--coverage-dir', options.coverage_dir, - '--metadata-dir', os.path.join(CHROME_OUT_DIR, options.target), + '--metadata-dir', os.path.join(CHROME_SRC, 'out', options.target), '--cleanup', '--output', os.path.join(coverage_html, 'index.html')]) UploadCoverageData(options, coverage_html, 'java') @@ -368,11 +357,10 @@ def GenerateJavaCoverageReport(options): def LogcatDump(options): # Print logcat, kill logcat monitor bb_annotations.PrintNamedStep('logcat_dump') - logcat_file = os.path.join(CHROME_OUT_DIR, options.target, 'full_log') + logcat_file = os.path.join(CHROME_SRC, 'out', options.target, 'full_log') with open(logcat_file, 'w') as f: RunCmd([ - os.path.join(CHROME_SRC_DIR, 'build', 'android', - 'adb_logcat_printer.py'), + os.path.join(CHROME_SRC, 'build', 'android', 'adb_logcat_printer.py'), LOGCAT_DIR], stdout=f) RunCmd(['cat', logcat_file]) @@ -380,7 +368,7 @@ def LogcatDump(options): def GenerateTestReport(options): bb_annotations.PrintNamedStep('test_report') for report in glob.glob( - os.path.join(CHROME_OUT_DIR, options.target, 'test_logs', '*.log')): + os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')): RunCmd(['cat', report]) os.remove(report) @@ -460,7 +448,7 @@ def main(argv): setattr(options, 'target', options.factory_properties.get('target', 'Debug')) if options.coverage_bucket: setattr(options, 'coverage_dir', - os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) + os.path.join(CHROME_SRC, 'out', options.target, 'coverage')) MainTestWrapper(options) diff --git a/android/buildbot/bb_utils.py b/android/buildbot/bb_utils.py index f90110331..4aa9b47ac 100644 --- a/android/buildbot/bb_utils.py +++ b/android/buildbot/bb_utils.py @@ -24,9 +24,6 @@ BB_BUILD_DIR = os.path.abspath( CHROME_SRC = os.path.abspath( os.path.join(os.path.dirname(__file__), '..', '..', '..')) -# TODO: Figure out how to merge this with pylib.cmd_helper.OutDirectory(). -CHROME_OUT_DIR = os.path.join(CHROME_SRC, 'out') - GOMA_DIR = os.environ.get('GOMA_DIR', os.path.join(BB_BUILD_DIR, 'goma')) GSUTIL_PATH = os.path.join(BB_BUILD_DIR, 'third_party', 'gsutil', 'gsutil')