| Index: tools/test.py
|
| ===================================================================
|
| --- tools/test.py (revision 7582)
|
| +++ tools/test.py (working copy)
|
| @@ -117,8 +117,6 @@
|
| start = time.time()
|
| output = case.Run()
|
| case.duration = (time.time() - start)
|
| - except BreakNowException:
|
| - self.terminate = True
|
| except IOError, e:
|
| assert self.terminate
|
| return
|
| @@ -320,13 +318,7 @@
|
| # --- F r a m e w o r k ---
|
| # -------------------------
|
|
|
| -class BreakNowException(Exception):
|
| - def __init__(self, value):
|
| - self.value = value
|
| - def __str__(self):
|
| - return repr(self.value)
|
|
|
| -
|
| class CommandOutput(object):
|
|
|
| def __init__(self, exit_code, timed_out, stdout, stderr):
|
| @@ -387,12 +379,9 @@
|
|
|
| def Run(self):
|
| self.BeforeRun()
|
| - result = None;
|
| + result = "exception"
|
| try:
|
| result = self.RunCommand(self.GetCommand())
|
| - except:
|
| - self.terminate = True;
|
| - raise BreakNowException("Used pressed CTRL+C or IO went wrong")
|
| finally:
|
| self.AfterRun(result)
|
| return result
|
| @@ -713,12 +702,7 @@
|
|
|
| def RunTestCases(cases_to_run, progress, tasks):
|
| progress = PROGRESS_INDICATORS[progress](cases_to_run)
|
| - result = 0;
|
| - try:
|
| - result = progress.Run(tasks)
|
| - except Exception, e:
|
| - print "\n", e
|
| - return result
|
| + return progress.Run(tasks)
|
|
|
|
|
| def BuildRequirements(context, requirements, mode, scons_flags):
|
|
|