Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Unified Diff: tools/testrunner/local/execution.py

Issue 11028027: Revert trunk to bleeding_edge at r12484 (Closed) Base URL: https://v8.googlecode.com/svn/trunk
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/testrunner/local/commands.py ('k') | tools/testrunner/local/old_statusfile.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testrunner/local/execution.py
diff --git a/tools/testrunner/local/execution.py b/tools/testrunner/local/execution.py
deleted file mode 100644
index fd331e239fbf7ef92db9d263a42039d85cceff9f..0000000000000000000000000000000000000000
--- a/tools/testrunner/local/execution.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2012 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-import multiprocessing
-import os
-import threading
-import time
-
-from . import commands
-from . import utils
-
-
-class Job(object):
- def __init__(self, command, dep_command, test_id, timeout, verbose):
- self.command = command
- self.dep_command = dep_command
- self.id = test_id
- self.timeout = timeout
- self.verbose = verbose
-
-
-def RunTest(job):
- try:
- start_time = time.time()
- if job.dep_command is not None:
- dep_output = commands.Execute(job.dep_command, job.verbose, job.timeout)
- # TODO(jkummerow): We approximate the test suite specific function
- # IsFailureOutput() by just checking the exit code here. Currently
- # only cctests define dependencies, for which this simplification is
- # correct.
- if dep_output.exit_code != 0:
- return (job.id, dep_output, time.time() - start_time)
- output = commands.Execute(job.command, job.verbose, job.timeout)
- return (job.id, output, time.time() - start_time)
- except Exception, e:
- print(">>> EXCEPTION: %s" % e)
- return (-1, -1, 0)
-
-
-class Runner(object):
-
- def __init__(self, suites, progress_indicator, context):
- self.tests = [ t for s in suites for t in s.tests ]
- self._CommonInit(len(self.tests), progress_indicator, context)
-
- def _CommonInit(self, num_tests, progress_indicator, context):
- self.indicator = progress_indicator
- progress_indicator.runner = self
- self.context = context
- self.succeeded = 0
- self.total = num_tests
- self.remaining = num_tests
- self.failed = []
- self.crashed = 0
- self.terminate = False
- self.lock = threading.Lock()
-
- def Run(self, jobs):
- self.indicator.Starting()
- self._RunInternal(jobs)
- self.indicator.Done()
- return not self.failed
-
- def _RunInternal(self, jobs):
- pool = multiprocessing.Pool(processes=jobs)
- test_map = {}
- queue = []
- for test in self.tests:
- assert test.id >= 0
- test_map[test.id] = test
- command = self.GetCommand(test)
- timeout = self.context.timeout
- if ("--stress-opt" in test.flags or
- "--stress-opt" in self.context.mode_flags or
- "--stress-opt" in self.context.extra_flags):
- timeout *= 4
- if test.dependency is not None:
- dep_command = [ c.replace(test.path, test.dependency) for c in command ]
- else:
- dep_command = None
- job = Job(command, dep_command, test.id, timeout, self.context.verbose)
- queue.append(job)
- try:
- kChunkSize = 1
- it = pool.imap_unordered(RunTest, queue, kChunkSize)
- for result in it:
- test_id = result[0]
- if test_id < 0:
- raise BreakNowException("User pressed Ctrl+C or IO went wrong")
- test = test_map[test_id]
- self.indicator.AboutToRun(test)
- test.output = result[1]
- test.duration = result[2]
- if test.suite.HasUnexpectedOutput(test):
- self.failed.append(test)
- if test.output.HasCrashed():
- self.crashed += 1
- else:
- self.succeeded += 1
- self.remaining -= 1
- self.indicator.HasRun(test)
- except:
- pool.terminate()
- pool.join()
- raise
- return
-
-
- def GetCommand(self, test):
- d8testflag = []
- shell = test.suite.shell()
- if shell == "d8":
- d8testflag = ["--test"]
- if utils.IsWindows():
- shell += ".exe"
- cmd = ([self.context.command_prefix] +
- [os.path.join(self.context.shell_dir, shell)] +
- d8testflag +
- test.suite.GetFlagsForTestCase(test, self.context) +
- [self.context.extra_flags])
- cmd = [ c for c in cmd if c != "" ]
- return cmd
-
-
-class BreakNowException(Exception):
- def __init__(self, value):
- self.value = value
- def __str__(self):
- return repr(self.value)
« no previous file with comments | « tools/testrunner/local/commands.py ('k') | tools/testrunner/local/old_statusfile.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698