diff options
| author | Vincent Palatin <vpalatin@chromium.org> | 2012-06-08 00:35:33 +0000 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-06-07 20:01:49 -0700 |
| commit | c4ac74a11dfa66d6ad725833e2aac6579b0c76ed (patch) | |
| tree | 2e17c3756070bd981872bbd4575936d740b44562 | |
| parent | 94ff216f3250ebccd3196423d427c1c9a552590b (diff) | |
| download | chrome-ec-c4ac74a11dfa66d6ad725833e2aac6579b0c76ed.tar.gz | |
fix QEMU OS tests
- update strings which were modified by the message text "compression"
- updated QEMU which supports a couple of additional registers for LM4F
(getting internal oscillator calibration status and writing timer
counter through TAV)
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:10008
TEST=make qemu-tests
Change-Id: Idf0ee13f354b4e14405e949861d426f3e4c3022b
Reviewed-on: https://gerrit.chromium.org/gerrit/24827
Reviewed-by: Vic Yang <victoryang@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | test/hello.py | 8 | ||||
| -rw-r--r-- | test/timer_calib.py | 2 | ||||
| -rwxr-xr-x | util/qemu-system-arm | bin | 15621946 -> 3509800 bytes |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/hello.py b/test/hello.py index 956a43b8f8..ef647e41f4 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("--- UART 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"] + ro = helper.wait_output("RO:\s*(?P<ro>\S+)", use_re=True)["ro"] + wa = helper.wait_output("RW-A:\s*(?P<a>\S+)", use_re=True)["a"] + wb = helper.wait_output("RW-B:\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 1d873334ed..8d2f328734 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("--- UART 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 Binary files differindex fe38b6fc25..e84e498e8d 100755 --- a/util/qemu-system-arm +++ b/util/qemu-system-arm |