From patchwork Fri Oct 25 13:12:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 11212341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 60EE71709 for ; Fri, 25 Oct 2019 13:30:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 364BD21D71 for ; Fri, 25 Oct 2019 13:30:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CEOAssEp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 364BD21D71 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:59976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNzfL-0003Oi-Tm for patchwork-qemu-devel@patchwork.kernel.org; Fri, 25 Oct 2019 09:30:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58971) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNzPK-0005EP-J4 for qemu-devel@nongnu.org; Fri, 25 Oct 2019 09:13:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNzPJ-000199-1O for qemu-devel@nongnu.org; Fri, 25 Oct 2019 09:13:34 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:33089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNzPI-00018c-RQ for qemu-devel@nongnu.org; Fri, 25 Oct 2019 09:13:32 -0400 Received: by mail-wr1-x433.google.com with SMTP id s1so2327631wro.0 for ; Fri, 25 Oct 2019 06:13:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=87Iy/QnNHtLxvX6jVSCCgi733svf73GUIYITANarm74=; b=CEOAssEp36eyQn1sd3bGdxLpBlO3fXB5cQuc6Dphl3LW1vTB76/6NxXlidKZ50622a OgQtSmEW+xAHLiguYftEVbokud1GZvYOiPMPgmvD4Hdkxr1wNr3IwTc8isTzIzobDo5w PIpM1pF6TubN9a/NulYIwib37fHze9Hqb7wbuhyCiwl3xrhNovgJ7jAafSRMeAk2goBg +WszyeQXMsQT8eYAJFMsySegpUBV6zlyQCAqEFEJ5Z+EMUV+omJfLM73n1tatYWd63zP ks3TSK9C0JnJBxNh+1pN4G9Sh9V3uXF36po0FfE816PqCLBuakLYompFfT9schU0z2Wp 91TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=87Iy/QnNHtLxvX6jVSCCgi733svf73GUIYITANarm74=; b=Wr6HXCRZBYwOIUZVbOzsn7QAMHuLvbTmvWi8UbQEUhhC24OhAp3CUmmFlrjDeTxrCf RvqCf+iTLTy25Kd1lTWLNrIH+GdO+Sb3m0RMTighQRC9rvUKWTT/s632IP/FpP/yJVzx h0VRe9QD7FQvV9dy8P6rrnHxIh3jtc4XvJefIdCcYh0QGHOKi9K1dyBXb3YOp5SLV3XV TksIEMC8PKELAkKVguJV8ajQv7V8Wh1iL07QmZA3zTRngdu2c647plc4pHv6Chq1p+mD xWNjzPPfiIi4IU47Ji7wdIV+bGQOkZ/8MvivnHTnA2w+r04YTCBPHTtIIqbVKNozUMrc bGhA== X-Gm-Message-State: APjAAAWlvXBCHJJlXQq3tPqnT3LyBpPGKViCx/9gGF9RVId5Qk4c2T5o Ki5d4BRRPJEiZqJy51IQd2aKb+BK3cWOpQ== X-Google-Smtp-Source: APXvYqx3V2YKrjX+H1GQ4WWno3CqKgoG86veOiA1gwgsQm7Wq2JkL5E/URqEPx6FsyOzwLgUpm4BlA== X-Received: by 2002:a5d:544d:: with SMTP id w13mr3060836wrv.19.1572009211310; Fri, 25 Oct 2019 06:13:31 -0700 (PDT) Received: from 8c859074c0ff.ant.amazon.com.com (bzq-79-181-93-41.red.bezeqint.net. [79.181.93.41]) by smtp.gmail.com with ESMTPSA id x205sm2616139wmb.5.2019.10.25.06.13.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Oct 2019 06:13:30 -0700 (PDT) From: Michael Rolnik To: qemu-devel@nongnu.org Subject: [PATCH v34 13/13] target/avr: Add tests Date: Fri, 25 Oct 2019 16:12:37 +0300 Message-Id: <20191025131237.63149-14-mrolnik@gmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20191025131237.63149-1-mrolnik@gmail.com> References: <20191025131237.63149-1-mrolnik@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, Michael Rolnik , richard.henderson@linaro.org, dovgaluk@ispras.ru, imammedo@redhat.com, philmd@redhat.com, aleksandar.m.mail@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 1. Avocado test The test is based on https://github.com/seharris/qemu-avr-tests/tree/master/free-rtos/Demo demo which. If working correctly, prints 'ABCDEFGHIJKLMNOPQRSTUVWX' out. it also demostrates that timer and IRQ are working 2. Boot serial test Print out 'T' through serial port Signed-off-by: Michael Rolnik Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Acked-by: Thomas Huth --- tests/Makefile.include | 2 ++ tests/acceptance/machine_avr6.py | 36 ++++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 +++++++++ 3 files changed, 48 insertions(+) create mode 100644 tests/acceptance/machine_avr6.py diff --git a/tests/Makefile.include b/tests/Makefile.include index 09e5b410dc..7f3f971191 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -206,6 +206,8 @@ check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF) check-qtest-i386-y += tests/numa-test$(EXESUF) check-qtest-x86_64-y += $(check-qtest-i386-y) +check-qtest-avr-y += tests/boot-serial-test$(EXESUF) + check-qtest-alpha-y += tests/boot-serial-test$(EXESUF) check-qtest-alpha-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF) diff --git a/tests/acceptance/machine_avr6.py b/tests/acceptance/machine_avr6.py new file mode 100644 index 0000000000..0601080b01 --- /dev/null +++ b/tests/acceptance/machine_avr6.py @@ -0,0 +1,36 @@ +import logging +import time +import distutils.spawn + +from avocado import skipUnless +from avocado_qemu import Test +from avocado.utils import process + +class AVR6Machine(Test): + timeout = 5 + + def test_freertos(self): + """ + :avocado: tags=arch:avr + :avocado: tags=machine:sample + """ + """ + https://github.com/seharris/qemu-avr-tests/raw/master/free-rtos/Demo/AVR_ATMega2560_GCC/demo.elf + constantly prints out 'ABCDEFGHIJKLMNOPQRSTUVWXABCDEFGHIJKLMNOPQRSTUVWX' + """ + rom_url = 'https://github.com/seharris/qemu-avr-tests' + rom_url += '/raw/master/free-rtos/Demo/AVR_ATMega2560_GCC/demo.elf' + rom_hash = '7eb521f511ca8f2622e0a3c5e8dd686efbb911d4' + rom_path = self.fetch_asset(rom_url, asset_hash=rom_hash) + + self.vm.set_machine('sample') + self.vm.add_args('-bios', rom_path) + self.vm.add_args('-nographic') + self.vm.launch() + + time.sleep(2) + self.vm.shutdown() + + match = 'ABCDEFGHIJKLMNOPQRSTUVWXABCDEFGHIJKLMNOPQRSTUVWX' + + self.assertIn(match, self.vm.get_log()) diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index d3a54a0ba5..1121ed0db2 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -16,6 +16,15 @@ #include "qemu/osdep.h" #include "libqtest.h" +static const uint8_t bios_avr[] = { + 0x88, 0xe0, /* ldi r24, 0x08 */ + 0x80, 0x93, 0xc1, 0x00, /* sts 0x00C1, r24 ; Enable tx */ + 0x86, 0xe0, /* ldi r24, 0x06 */ + 0x80, 0x93, 0xc2, 0x00, /* sts 0x00C2, r24 ; Set the data bits to 8 */ + 0x84, 0xe5, /* ldi r24, 0x54 */ + 0x80, 0x93, 0xc6, 0x00, /* sts 0x00C6, r24 ; Output 'T' */ +}; + static const uint8_t kernel_mcf5208[] = { 0x41, 0xf9, 0xfc, 0x06, 0x00, 0x00, /* lea 0xfc060000,%a0 */ 0x10, 0x3c, 0x00, 0x54, /* move.b #'T',%d0 */ @@ -103,6 +112,7 @@ typedef struct testdef { static testdef_t tests[] = { { "alpha", "clipper", "", "PCI:" }, + { "avr", "sample", "", "T", sizeof(bios_avr), NULL, bios_avr }, { "ppc", "ppce500", "", "U-Boot" }, { "ppc", "40p", "-vga none -boot d", "Trying cd:," }, { "ppc", "g3beige", "", "PowerPC,750" },