Issue 11817033: Move android buildbot steps into buildbot dir

Issue 11817033: Move android buildbot steps into buildbot dir (Closed)

Created:
7 years, 11 months ago by Isaac (away)

Modified:
7 years, 11 months ago

Reviewers:
frankf

CC:
chromium-reviews, ilevy+watch_chromium.org, bulach+watch_chromium.org, yfriedman+watch_chromium.org, peter+watch_chromium.org, klundberg+watch_chromium.org, frankf+watch_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

Move android buildbot steps into buildbot dir - Move the step creation lines to the parent script. The biggest advantage of this is the full step is properly printed, starting with the exact shell line used to run the test suite. - Rename some steps into c++ style. BUG=168894 NOTRY=true Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176010

Patch Set 1 #

Total comments: 6

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Total comments: 6

Patch Set 5 : #

Created: 7 years, 11 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+41 lines, -34 lines)			Patch
M	build/android/buildbot/bb_tests.py	View	1 2 3 4	4 chunks	+12 lines, -11 lines	0 comments	Download
M	build/android/device_status_check.py	View	1	1 chunk	+0 lines, -1 line	0 comments	Download
A	build/android/pylib/gtest/gtest_config.py	View	1 2 3	1 chunk	+25 lines, -0 lines	0 comments	Download
M	build/android/run_tests.py	View	1 2 3 4	7 chunks	+4 lines, -22 lines	0 comments	Download

Messages

Total messages: 10 (0 generated)

Expand Messages | Collapse Messages

Isaac (away)

I know this might not be final location for test list. Just uploading for initial ...

7 years, 11 months ago (2013-01-09 21:39:31 UTC) #1

frankf

https://chromiumcodereview.appspot.com/11817033/diff/1/build/android/pylib/constants.py File build/android/pylib/constants.py (right): https://chromiumcodereview.appspot.com/11817033/diff/1/build/android/pylib/constants.py#newcode57 build/android/pylib/constants.py:57: DEFAULT_UNIT_TEST_SUITES = [ Please see the bug. I don't ...

7 years, 11 months ago (2013-01-09 21:53:02 UTC) #2

Isaac (away)

7 years, 11 months ago (2013-01-09 21:59:58 UTC) #3

frankf

https://chromiumcodereview.appspot.com/11817033/diff/11001/build/android/buildbot/bb_tests.py File build/android/buildbot/bb_tests.py (right): https://chromiumcodereview.appspot.com/11817033/diff/11001/build/android/buildbot/bb_tests.py#newcode195 build/android/buildbot/bb_tests.py:195: RunTestSuites(options, ['TestWebKitAPI']) nit: Move to to gtest_config as well? ...

7 years, 11 months ago (2013-01-10 02:22:30 UTC) #5

Isaac (away)

7 years, 11 months ago (2013-01-10 02:54:24 UTC) #6

frankf

LGTM but please make sure this doesn't break things downstream.

7 years, 11 months ago (2013-01-10 02:57:19 UTC) #7

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ilevy@chromium.org/11817033/12002

7 years, 11 months ago (2013-01-10 04:01:48 UTC) #8

commit-bot: I haz the power

Failed to apply patch for build/android/buildbot/bb_tests.py: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

7 years, 11 months ago (2013-01-10 04:01:53 UTC) #9

Message was sent while issue was closed.

Failed to apply patch for build/android/buildbot/bb_tests.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/android/buildbot/bb_tests.py
  Hunk #1 FAILED at 16.
  Hunk #2 FAILED at 82.
  Hunk #3 FAILED at 169.
  Hunk #4 FAILED at 184.
  4 out of 4 hunks FAILED -- saving rejects to file
build/android/buildbot/bb_tests.py.rej

Patch:       build/android/buildbot/bb_tests.py
Index: build/android/buildbot/bb_tests.py
diff --git a/build/android/buildbot/bb_tests.py
b/build/android/buildbot/bb_tests.py
index
a1903c4c33b6e8ce052079e706b5b2a1b91d4ec3..094d6fb8ef1502c2604e2b826478fb645484a67e
100755
--- a/build/android/buildbot/bb_tests.py
+++ b/build/android/buildbot/bb_tests.py
@@ -16,6 +16,7 @@ import sys
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import buildbot_report
 from pylib import constants
+from pylib.gtest import gtest_config
 
 
 TESTING = 'BUILDBOT_TESTING' in os.environ
@@ -82,21 +83,21 @@ def RunCmd(command, flunk_on_failure=True):
   return code
 
 
-def RunTestSuites(options, suite):
+def RunTestSuites(options, suites):
   """Manages an invocation of run_tests.py.
 
   Args:
     options: options object.
-    suite: The suite to pass to run_tests or None to run default suites.
+    suites: List of suites to run.
   """
   args = ['--verbose']
-  if suite:
-    args.extend(['-s', suite])
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
-  RunCmd(['build/android/run_tests.py'] + args)
+  for suite in suites:
+    buildbot_report.PrintNamedStep(suite)
+    RunCmd(['build/android/run_tests.py', '-s', suite] + args)
 
 
 def InstallApk(options, test, print_step=False):
@@ -169,6 +170,7 @@ def RunWebkitLayoutTests(options):
 
 def MainTestWrapper(options):
   # Device check and alert emails
+  buildbot_report.PrintNamedStep('device_status_check')
   RunCmd(['build/android/device_status_check.py'], flunk_on_failure=False)
 
   if options.install:
@@ -184,25 +186,24 @@ def MainTestWrapper(options):
   SpawnCmd(['build/android/adb_logcat_monitor.py', logcat_dir])
 
   if 'unit' in options.test_filter:
-    RunTestSuites(options, None)
+    RunTestSuites(options, gtest_config.STABLE_TEST_SUITES)
   if 'ui' in options.test_filter:
     for test in INSTRUMENTATION_TESTS.itervalues():
       RunInstrumentationSuite(options, test)
   if 'webkit' in options.test_filter:
-    RunTestSuites(options, 'webkit_unit_tests')
-    RunTestSuites(options, 'TestWebKitAPI')
+    RunTestSuites(options, ['webkit_unit_tests', 'TestWebKitAPI'])
     RunWebkitLint(options.target)
   if 'webkit_layout' in options.test_filter:
     RunWebkitLayoutTests(options)
 
   if options.experimental:
-    RunTestSuites(options, 'sandbox_linux_unittests')
+    RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
 
   # Print logcat, kill logcat monitor
-  buildbot_report.PrintNamedStep('Logcat dump')
+  buildbot_report.PrintNamedStep('logcat_dump')
   RunCmd(['build/android/adb_logcat_printer.py', logcat_dir])
 
-  buildbot_report.PrintNamedStep('Test report')
+  buildbot_report.PrintNamedStep('test_report')
   for report in glob.glob(
       os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')):
     subprocess.Popen(['cat', report]).wait()

Isaac (away)

7 years, 11 months ago (2013-01-10 04:11:34 UTC) #10

Message was sent while issue was closed.

dcommitted...  rolled downstream and committed the sister patch.

Expand Messages | Collapse Messages