summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/hello.py4
-rw-r--r--test/timer_calib.py2
-rwxr-xr-xutil/qemu-system-armbin15612250 -> 15621946 bytes
3 files changed, 3 insertions, 3 deletions
diff --git a/test/hello.py b/test/hello.py
index a717185fd0..956a43b8f8 100644
--- a/test/hello.py
+++ b/test/hello.py
@@ -6,10 +6,10 @@
#
def test(helper):
- helper.wait_output("--- Chrome EC initialized! ---")
+ helper.wait_output("--- Chrome EC initialized")
helper.ec_command("version")
ro = helper.wait_output("RO version:\s*(?P<ro>\S+)", use_re=True)["ro"]
wa = helper.wait_output("RW-A version:\s*(?P<a>\S+)", use_re=True)["a"]
- wb = helper.wait_output("RW-B version:\s*(?P<b>\S+)", use_re=True)["b"]
+ wb = helper.wait_output("RW-B version:\s*(?P<b>\S*)", use_re=True)["b"]
helper.trace("Version (RO/A/B) %s / %s / %s\n" % (ro, wa, wb))
return True # PASS !
diff --git a/test/timer_calib.py b/test/timer_calib.py
index d62e9f7634..1d873334ed 100644
--- a/test/timer_calib.py
+++ b/test/timer_calib.py
@@ -39,7 +39,7 @@ def test(helper):
one_pass(helper)
helper.ec_command("reboot")
- helper.wait_output("--- Chrome EC initialized! ---")
+ helper.wait_output("--- Chrome EC initialized")
# get the timing results on the second pass
# to avoid binary translation overhead
diff --git a/util/qemu-system-arm b/util/qemu-system-arm
index ad0802ba06..fe38b6fc25 100755
--- a/util/qemu-system-arm
+++ b/util/qemu-system-arm
Binary files differ