self.process = subprocess.Popen(cmd, stdin=subprocess.PIPE,
stdout=logfile, stderr=logfile)
- # Wait for OpenOCD to have made it through riscv_examine(). When using
- # OpenOCD to communicate with a simulator this may take a long time,
- # and gdb will time out when trying to connect if we attempt too early.
- start = time.time()
- messaged = False
- while True:
- log = open(Openocd.logname).read()
- m = re.search(r"Listening on port (\d+) for gdb connections", log)
- if m:
- self.port = int(m.group(1))
- break
-
- if not self.process.poll() is None:
- header("OpenOCD log")
- sys.stdout.write(log)
- raise Exception(
- "OpenOCD exited before completing riscv_examine()")
- if not messaged and time.time() - start > 1:
- messaged = True
- print "Waiting for OpenOCD to start..."
- if time.time() - start > 60:
- raise Exception("ERROR: Timed out waiting for OpenOCD to "
- "listen for gdb")
+ try:
+ # Wait for OpenOCD to have made it through riscv_examine(). When
+ # using OpenOCD to communicate with a simulator this may take a
+ # long time, and gdb will time out when trying to connect if we
+ # attempt too early.
+ start = time.time()
+ messaged = False
+ while True:
+ log = open(Openocd.logname).read()
+ m = re.search(r"Listening on port (\d+) for gdb connections",
+ log)
+ if m:
+ self.port = int(m.group(1))
+ break
+
+ if not self.process.poll() is None:
+ raise Exception(
+ "OpenOCD exited before completing riscv_examine()")
+ if not messaged and time.time() - start > 1:
+ messaged = True
+ print "Waiting for OpenOCD to start..."
+ if time.time() - start > 60:
+ raise Exception("ERROR: Timed out waiting for OpenOCD to "
+ "listen for gdb")
+
+ except Exception:
+ header("OpenOCD log")
+ sys.stdout.write(log)
+ raise
def __del__(self):
try:
log_name = os.path.join(parsed.logs, "%s-%s-%s.log" %
(time.strftime("%Y%m%d-%H%M%S"), type(target).__name__, name))
log_fd = open(log_name, 'w')
- print "Running", name, "...",
+ print "Running %s > %s ..." % (name, log_name),
sys.stdout.flush()
log_fd.write("Test: %s\n" % name)
log_fd.write("Target: %s\n" % type(target).__name__)
log_fd.write("Time elapsed: %.2fs\n" % (time.time() - start))
print "%s in %.2fs" % (result, time.time() - start)
if result not in good_results and parsed.print_failures:
- sys.stdout.write(file(log_name).read())
+ sys.stdout.write(open(log_name).read())
sys.stdout.flush()
- results.setdefault(result, []).append(name)
+ results.setdefault(result, []).append((name, log_name))
count += 1
if result not in good_results and parsed.fail_fast:
break
print "%d tests returned %s" % (len(value), key)
if key not in good_results:
result = 1
- for test in value:
- print " ", test
+ for name, log_name in value:
+ print " %s > %s" % (name, log_name)
return result
result = "fail"
else:
result = "exception"
+ header ("Backtrace")
+ print e
if isinstance(e, TestFailed):
header("Message")
print e.message