zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision 0036d9b08e..2d05f4450c (457220:457366)

Browse Source 
Reverting MB changes from https://codereview.webrtc.org/2755433005/
since https://codereview.chromium.org/2695963003 was reverted.

Change log: 0036d9b08e..2d05f4450c
Full diff: 0036d9b08e..2d05f4450c

Changed dependencies:
* src/base: 921d4dc4be..536da69816
* src/build: 15d5fcab1c..81c2772699
* src/ios: 6f28a4ab1b..bee9511bdb
* src/testing: 3cc4ea5920..6d32ea1500
* src/third_party: 95b8b082f7..eccad07478
* src/third_party/catapult: 76b86f523b..faf60eb37f
* src/tools: 04c6d654f7..b06789b11a
DEPS diff: 0036d9b08e..2d05f4450c/DEPS

No update to Clang.

TBR=
BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2753773005
Cr-Commit-Position: refs/heads/master@{#17268}
This commit is contained in:
kjellander
2017-03-16 01:35:09 -07:00
committed by Commit bot
parent 22818a5804
commit 8430825856
3 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools-webrtc/mb/mb.py
View File

@ -1055,9 +1055,23 @@ class MetaBuildWrapper(object):
extra_files = []
if android:
cmdline = ['./../../build/android/test_wrapper/logdog_wrapper.py',
'--target', target,
'--logdog-bin-cmd', '../../bin/logdog_butler']
logdog_command = [
'--logdog-bin-cmd', './../../bin/logdog_butler',
'--project', 'chromium',
'--service-account-json',
'/creds/service_accounts/service-account-luci-logdog-publisher.json',
'--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
'--source', '${ISOLATED_OUTDIR}/logcats',
'--name', 'unified_logcats',
]
test_cmdline = [
self.PathJoin('bin', 'run_%s' % target),
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
]
if test_type != 'junit_test':
test_cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}',]
cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
+ logdog_command + test_cmdline + ['-v'])
else:
extra_files = ['../../testing/test_env.py']

25
tools-webrtc/mb/mb_unittest.py
View File

@ -379,8 +379,17 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, ['base_unittests'])
self.assertEqual(command, [
'./../../build/android/test_wrapper/logdog_wrapper.py',
'--target', 'base_unittests',
'--logdog-bin-cmd', '../../bin/logdog_butler',
'--logdog-bin-cmd', './../../bin/logdog_butler',
'--project', 'chromium',
'--service-account-json',
'/creds/service_accounts/service-account-luci-logdog-publisher.json',
'--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
'--source', '${ISOLATED_OUTDIR}/logcats',
'--name', 'unified_logcats',
'bin/run_base_unittests',
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
'--target-devices-file', '${SWARMING_BOT_FILE}',
'-v',
])
def test_gn_gen_swarming_android_junit_test(self):
@ -410,8 +419,16 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, ['base_unittests'])
self.assertEqual(command, [
'./../../build/android/test_wrapper/logdog_wrapper.py',
'--target', 'base_unittests',
'--logdog-bin-cmd', '../../bin/logdog_butler',
'--logdog-bin-cmd', './../../bin/logdog_butler',
'--project', 'chromium',
'--service-account-json',
'/creds/service_accounts/service-account-luci-logdog-publisher.json',
'--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
'--source', '${ISOLATED_OUTDIR}/logcats',
'--name', 'unified_logcats',
'bin/run_base_unittests',
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
'-v',
])
def test_gn_gen_non_parallel_console_test_launcher(self):