From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30C8EC352A3 for ; Tue, 11 Feb 2020 11:18:12 +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 EF43620714 for ; Tue, 11 Feb 2020 11:18:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cG65QQrc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF43620714 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1TYR-00054R-6F for qemu-devel@archiver.kernel.org; Tue, 11 Feb 2020 06:18:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42601) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1TWX-0002vK-3B for qemu-devel@nongnu.org; Tue, 11 Feb 2020 06:16:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1TWU-0003Bc-Ne for qemu-devel@nongnu.org; Tue, 11 Feb 2020 06:16:13 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27160 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j1TWU-0003BB-JG for qemu-devel@nongnu.org; Tue, 11 Feb 2020 06:16:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581419769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yowibTdaXcjc8RkbBJWoVt4vpCM1hY7dbLkAMhHsQmM=; b=cG65QQrcYv8cnxYgynkgANhJS9DZtJaFSP01Z7QkLUUWORvTE1f/VEDPrQGqUpLUMdsljA e5Hc4Bxj0JHtuKpfO22uF3Gj78IZ8yKi6FNU/BNYiS/2olzBJ/XDbSPdeDNRq4H0OMpmKB OupCeMNFX6gOs7QjtCZ7SJP/SRzfqr0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-248-0JGsV43DOu-3XvJ6ZWGulg-1; Tue, 11 Feb 2020 06:16:04 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6220D10054E3; Tue, 11 Feb 2020 11:16:03 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2932788836; Tue, 11 Feb 2020 11:15:55 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2] tests/acceptance: Add boot tests for sh4 and mips64 QEMU advent calendar images Date: Tue, 11 Feb 2020 12:15:52 +0100 Message-Id: <20200211111552.23932-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 0JGsV43DOu-3XvJ6ZWGulg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Magnus Damm , Wainer dos Santos Moschetta , Aleksandar Markovic , Aleksandar Rikalo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Now that we can select the second serial console in the acceptance tests (see commit 746f244d9720 "Allow to use other serial consoles than default")= , we can also test the sh4 image from the QEMU advent calendar 2018. And another recent commit (ec860426dfbe "Fix handling of LL/SC instructions= ") fixed a problem with qemu-system-mips64, so the mips64 from the advent calendar now works again and can be used for acceptance testing, too. Signed-off-by: Thomas Huth --- v2: Moved the mips test earlier so that it matches alphabetially the other advent calendar tests .travis.yml | 2 +- tests/acceptance/boot_linux_console.py | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5887055951..71a0097878 100644 --- a/.travis.yml +++ b/.travis.yml @@ -313,7 +313,7 @@ matrix: # Acceptance (Functional) tests - name: "GCC check-acceptance" env: - - CONFIG=3D"--target-list=3Daarch64-softmmu,alpha-softmmu,arm-soft= mmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-sof= tmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sparc-softmmu,x86= _64-softmmu,xtensa-softmmu" + - CONFIG=3D"--target-list=3Daarch64-softmmu,alpha-softmmu,arm-soft= mmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64-softmmu,mips64el-so= ftmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sh= 4-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu" - TEST_CMD=3D"make check-acceptance" after_script: - python3 -c 'import json; r =3D json.load(open("tests/results/lat= est/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"= ] not in ("PASS", "SKIP")]' | xargs cat diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 34d37eba3b..a8486d6231 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -591,12 +591,12 @@ class BootLinuxConsole(Test): console_pattern =3D 'No filesystem could mount root' self.wait_for_console_pattern(console_pattern) =20 - def do_test_advcal_2018(self, day, tar_hash, kernel_name): + def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=3D0)= : tar_url =3D ('https://www.qemu-advent-calendar.org' '/2018/download/day' + day + '.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) archive.extract(file_path, self.workdir) - self.vm.set_console() + self.vm.set_console(console_index=3Dconsole) self.vm.add_args('-kernel', self.workdir + '/day' + day + '/' + kernel_name) self.vm.launch() @@ -627,6 +627,17 @@ class BootLinuxConsole(Test): tar_hash =3D '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' self.do_test_advcal_2018('17', tar_hash, 'ballerina.bin') =20 + def test_mips64_malta(self): + """ + :avocado: tags=3Darch:mips64 + :avocado: tags=3Dmachine:malta + :avocado: tags=3Dendian:big + """ + tar_hash =3D '81b030201ec3f28cb1925297f6017d3a20d7ced5' + self.vm.add_args('-hda', self.workdir + '/day22/' + 'ri-li.qcow2', + '-append', 'root=3D/dev/hda') + self.do_test_advcal_2018('22', tar_hash, 'vmlinux') + def test_or1k_sim(self): """ :avocado: tags=3Darch:or1k @@ -670,6 +681,14 @@ class BootLinuxConsole(Test): self.vm.add_args('-M', 'graphics=3Doff') self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') =20 + def test_sh4_r2d(self): + """ + :avocado: tags=3Darch:sh4 + :avocado: tags=3Dmachine:r2d + """ + tar_hash =3D 'fe06a4fd8ccbf2e27928d64472939d47829d4c7e' + self.do_test_advcal_2018('09', tar_hash, 'zImage', console=3D1) + def test_sparc_ss20(self): """ :avocado: tags=3Darch:sparc --=20 2.18.1