diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/avocado/machine_mips_malta.py | 43 | ||||
| -rw-r--r-- | tests/qtest/qom-test.c | 12 |
2 files changed, 52 insertions, 3 deletions
diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mips_malta.py index f1895d59f3..92233451c5 100644 --- a/tests/avocado/machine_mips_malta.py +++ b/tests/avocado/machine_mips_malta.py @@ -11,11 +11,13 @@ import os import gzip import logging +from avocado import skipIf from avocado import skipUnless +from avocado.utils import archive from avocado_qemu import QemuSystemTest +from avocado_qemu import exec_command_and_wait_for_pattern +from avocado_qemu import interrupt_interactive_console_until_pattern from avocado_qemu import wait_for_console_pattern -from avocado.utils import archive -from avocado import skipIf NUMPY_AVAILABLE = True @@ -118,3 +120,40 @@ class MaltaMachineFramebuffer(QemuSystemTest): :avocado: tags=mips:smp """ self.do_test_i6400_framebuffer_logo(8) + +class MaltaMachine(QemuSystemTest): + + def do_test_yamon(self): + rom_url = ('http://www.imgtec.com/tools/mips-tools/downloads/' + 'yamon/yamon-bin-02.22.zip') + rom_hash = '8da7ecddbc5312704b8b324341ee238189bde480' + zip_path = self.fetch_asset(rom_url, asset_hash=rom_hash) + + archive.extract(zip_path, self.workdir) + yamon_path = os.path.join(self.workdir, 'yamon-02.22.bin') + + self.vm.set_console() + self.vm.add_args('-bios', yamon_path) + self.vm.launch() + + prompt = 'YAMON>' + pattern = 'YAMON ROM Monitor' + interrupt_interactive_console_until_pattern(self, pattern, prompt) + wait_for_console_pattern(self, prompt) + self.vm.shutdown() + + def test_mipsel_malta_yamon(self): + """ + :avocado: tags=arch:mipsel + :avocado: tags=machine:malta + :avocado: tags=endian:little + """ + self.do_test_yamon() + + def test_mips64el_malta_yamon(self): + """ + :avocado: tags=arch:mips64el + :avocado: tags=machine:malta + :avocado: tags=endian:little + """ + self.do_test_yamon() diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c index 13510bc349..d380261f8f 100644 --- a/tests/qtest/qom-test.c +++ b/tests/qtest/qom-test.c @@ -14,6 +14,8 @@ #include "qemu/cutils.h" #include "libqtest.h" +static bool verbose; + static void test_properties(QTestState *qts, const char *path, bool recurse) { char *child_path; @@ -49,7 +51,9 @@ static void test_properties(QTestState *qts, const char *path, bool recurse) } } else { const char *prop = qdict_get_str(tuple, "name"); - g_test_message("-> %s", prop); + if (verbose) { + g_test_message("-> %s", prop); + } tmp = qtest_qmp(qts, "{ 'execute': 'qom-get'," " 'arguments': { 'path': %s, 'property': %s } }", @@ -103,6 +107,12 @@ static void add_machine_test_case(const char *mname) int main(int argc, char **argv) { + char *v_env = getenv("V"); + + if (v_env && atoi(v_env) >= 2) { + verbose = true; + } + g_test_init(&argc, &argv, NULL); qtest_cb_for_every_machine(add_machine_test_case, g_test_quick()); |