Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge default -> production

--HG--
branch : production
  • Loading branch information...
commit fb61e658ceb23d7909fceb8cc50a4f1f24f7cf0d 2 parents 9be513c + 18b9692
Aki Sasaki escapewindow authored

Showing 1 changed file with 15 additions and 0 deletions. Show diff stats Hide diff stats

  1. +15 0 scripts/b2g_emulator_unittest.py
15 scripts/b2g_emulator_unittest.py
@@ -311,10 +311,21 @@ def preflight_run_tests(self):
311 311 if not os.path.isfile(self.adb_path):
312 312 self.fatal("The adb binary '%s' is not a valid file!" % self.adb_path)
313 313
  314 + def dump_ps(self):
  315 + # Bug 865837 - Dump the top ten processes that are using the most CPU
  316 + cmd = ['ps', '-eo', 'pcpu,pid,user,args']
  317 + lines = self.get_output_from_command(cmd, silent=True).split('\n')
  318 + lines.sort(reverse=True)
  319 + self.info('\n'.join(lines[0:10]))
  320 +
314 321 def run_tests(self):
315 322 """
316 323 Run the tests
317 324 """
  325 +
  326 + # Bug 865837: temporarily dump ps output to help debug an issue on ix slaves
  327 + self.dump_ps()
  328 +
318 329 dirs = self.query_abs_dirs()
319 330
320 331 error_list = self.error_list
@@ -370,6 +381,10 @@ def run_tests(self):
370 381 self._dump_logcat(parser)
371 382 self.fatal("Failed to install gecko 5 times in a row, aborting")
372 383
  384 + # Bug 865837: temporarily dump ps output on failure
  385 + if return_code:
  386 + self.dump_ps()
  387 +
373 388 tbpl_status, log_level = parser.evaluate_parser(return_code)
374 389 parser.append_tinderboxprint_line(suite_name)
375 390

Git Notes

Upstream source: https://hg.mozilla.org/build/mozharness/rev/4801aea65108443fcdcab95a00b4dcb48dbb35fa

0 comments on commit fb61e65

Please sign in to comment.
Something went wrong with that request. Please try again.