From 9868f9c5f30b05f2f4a37c6f083e29f3c7df5992 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Fri, 23 Oct 2020 14:24:13 +0200
Subject: assorted minor improvements

---
 lib/harness.py | 7 ++++---
 lib/loader.py  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/harness.py b/lib/harness.py
index 92fb9b4..de70ace 100644
--- a/lib/harness.py
+++ b/lib/harness.py
@@ -287,8 +287,8 @@ class TransitionHarness:
                     if transition.name != log_data_target["name"]:
                         self.abort = True
                         raise RuntimeError(
-                            "Log mismatch: Expected transition {:s}, got transition {:s} -- may have been caused by preceding malformed UART output".format(
-                                log_data_target["name"], transition.name
+                            "Log mismatch: Expected transition {:s}, got transition {:s}\nMay have been caused by preceding malformed UART output\nOffending line: {:s}".format(
+                                log_data_target["name"], transition.name, line
                             )
                         )
                     if self.log_return_values and len(transition.return_value_handlers):
@@ -373,6 +373,7 @@ class OnboardTimerHarness(TransitionHarness):
     def copy(self):
         new_harness = __class__(
             (self.one_cycle_in_us, self.one_overflow_in_us, self.counter_max_overflow),
+            remove_nop_from_timings=self.remove_nop_from_timings,
             gpio_pin=self.gpio_pin,
             gpio_mode=self.gpio_mode,
             pta=self.pta,
@@ -647,7 +648,7 @@ class OnboardTimerHarness(TransitionHarness):
                     if transition.name != log_data_target["name"]:
                         self.abort = True
                         raise RuntimeError(
-                            "Log mismatch in benchmark id={:d} trace={:d}: transition #{:d} (ID {:d}): Expected transition {:s}, got transition {:s} -- may have been caused by preceding maformed UART output".format(
+                            "Log mismatch in benchmark id={:d} trace={:d}: transition #{:d} (ID {:d}): Expected transition {:s}, got transition {:s}\nMay have been caused by preceding maformed UART output\nOffending line: {:s}".format(
                                 0,
                                 self.trace_id,
                                 self.current_transition_in_trace,
diff --git a/lib/loader.py b/lib/loader.py
index 649c032..a319c94 100644
--- a/lib/loader.py
+++ b/lib/loader.py
@@ -1004,7 +1004,7 @@ class RawData:
                                     "info": members[0],
                                     "setup": self.setup_by_fileno[j],
                                     "repeat_id": repeat_id,
-                                    "expected_trace": ptalog["traces"][j],
+                                    "expected_trace": traces,
                                     "with_traces": self.with_traces,
                                     "transition_names": list(
                                         map(
-- 
cgit v1.2.3