
""" Run the Skia bench_pictures executable. """

from android_render_pictures import AndroidRenderPictures
from android_run_bench import DoBench
from bench_pictures import BenchPictures
from build_step import BuildStep
import sys

class AndroidBenchPictures(BenchPictures, AndroidRenderPictures):
  def _DoBenchPictures(self, config, threads):
    data_file = self._BuildDataFile(self._device_dirs.SKPPerfDir(), config,
                                    threads)
    args = self._PictureArgs(self._device_dirs.SKPDir(), config, threads)
    DoBench(serial=self._serial,
            executable='bench_pictures',
            perf_data_dir=self._perf_data_dir,
            device_perf_dir=self._device_dirs.SKPPerfDir(),
            data_file=data_file,
            extra_args=args)

  def _Run(self):
    self._PushSKPSources(self._serial)
    super(AndroidBenchPictures, self)._Run()

if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(AndroidBenchPictures))


""" Run the Skia bench_pictures executable. """

from android_render_pictures import AndroidRenderPictures
from android_run_bench import DoBench
from bench_pictures import BenchPictures
from build_step import BuildStep
import sys

class AndroidBenchPictures(BenchPictures, AndroidRenderPictures):
  def __init__(self, args, attempts=1, timeout=4800):
    super(AndroidBenchPictures, self).__init__(args, attempts=attempts,
                                               timeout=timeout)

  def _DoBenchPictures(self, config, threads):
    data_file = self._BuildDataFile(self._device_dirs.SKPPerfDir(), config,
                                    threads)
    args = self._PictureArgs(self._device_dirs.SKPDir(), config, threads)
    DoBench(serial=self._serial,
            executable='bench_pictures',
            perf_data_dir=self._perf_data_dir,
            device_perf_dir=self._device_dirs.SKPPerfDir(),
            data_file=data_file,
            extra_args=args)

  def _Run(self):
    self._PushSKPSources(self._serial)
    super(AndroidBenchPictures, self)._Run()

if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(AndroidBenchPictures))

Increase timeout for bench_pictures on Android
Increase timeout for bench_pictures on Android

Unreviewed.

git-svn-id: 32fc27f4dcfb6c0385cd9719852b95fe6680452d@6290 2bbb7eff-a529-9590-31e7-b0007b416f81

  
  """ Run the Skia bench_pictures executable. """
  
  from android_render_pictures import AndroidRenderPictures
  from android_run_bench import DoBench
  from bench_pictures import BenchPictures
  from build_step import BuildStep
  import sys
  
  class AndroidBenchPictures(BenchPictures, AndroidRenderPictures):
+   def __init__(self, args, attempts=1, timeout=4800):
+     super(AndroidBenchPictures, self).__init__(args, attempts=attempts,
+                                                timeout=timeout)
+ 
    def _DoBenchPictures(self, config, threads):
      data_file = self._BuildDataFile(self._device_dirs.SKPPerfDir(), config,
                                      threads)
      args = self._PictureArgs(self._device_dirs.SKPDir(), config, threads)
      DoBench(serial=self._serial,
              executable='bench_pictures',
              perf_data_dir=self._perf_data_dir,
              device_perf_dir=self._device_dirs.SKPPerfDir(),
              data_file=data_file,
              extra_args=args)
  
    def _Run(self):
      self._PushSKPSources(self._serial)
      super(AndroidBenchPictures, self)._Run()
  
  if '__main__' == __name__:
    sys.exit(BuildStep.RunBuildStep(AndroidBenchPictures))
  
Increase timeout for bench_pictures on Android
## Code Before:

""" Run the Skia bench_pictures executable. """

from android_render_pictures import AndroidRenderPictures
from android_run_bench import DoBench
from bench_pictures import BenchPictures
from build_step import BuildStep
import sys

class AndroidBenchPictures(BenchPictures, AndroidRenderPictures):
  def _DoBenchPictures(self, config, threads):
    data_file = self._BuildDataFile(self._device_dirs.SKPPerfDir(), config,
                                    threads)
    args = self._PictureArgs(self._device_dirs.SKPDir(), config, threads)
    DoBench(serial=self._serial,
            executable='bench_pictures',
            perf_data_dir=self._perf_data_dir,
            device_perf_dir=self._device_dirs.SKPPerfDir(),
            data_file=data_file,
            extra_args=args)

  def _Run(self):
    self._PushSKPSources(self._serial)
    super(AndroidBenchPictures, self)._Run()

if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(AndroidBenchPictures))

## Instruction:
Increase timeout for bench_pictures on Android
## Code After:

""" Run the Skia bench_pictures executable. """

from android_render_pictures import AndroidRenderPictures
from android_run_bench import DoBench
from bench_pictures import BenchPictures
from build_step import BuildStep
import sys

class AndroidBenchPictures(BenchPictures, AndroidRenderPictures):
  def __init__(self, args, attempts=1, timeout=4800):
    super(AndroidBenchPictures, self).__init__(args, attempts=attempts,
                                               timeout=timeout)

  def _DoBenchPictures(self, config, threads):
    data_file = self._BuildDataFile(self._device_dirs.SKPPerfDir(), config,
                                    threads)
    args = self._PictureArgs(self._device_dirs.SKPDir(), config, threads)
    DoBench(serial=self._serial,
            executable='bench_pictures',
            perf_data_dir=self._perf_data_dir,
            device_perf_dir=self._device_dirs.SKPPerfDir(),
            data_file=data_file,
            extra_args=args)

  def _Run(self):
    self._PushSKPSources(self._serial)
    super(AndroidBenchPictures, self)._Run()

if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(AndroidBenchPictures))
