From nobody Fri Apr 19 21:11:01 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675075545; cv=none; d=zohomail.com; s=zohoarc; b=GfUYztD6393TQ2MAQeMjHbT5KcGCfZqo+ZkGx2QUaAfVYGXN96DOkW0AI3oJ3NUwKPLyA6r1nwuZzFmGe5ZCcQoKF1v5p4cqe5iqS6rYDhm2PwV8svH6xw8V5NR7IuXG/ruLLpiy1rMxiPQgRspPVuXMECZkYR32sz6BPt2tC9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675075545; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v7GI/MD5ZaL5dkXpJYBjXMF4QyvJErgyxsGf8fwFHwo=; b=LNLabmW1nNpqinCJaKzIR3IXIVL5urRyj7pjGgJawuBHczmQfMzFdSmbULqZFqfsxg/SD2nDAbA4dx3f0rfx0vh6AMh304/N0qfW5ZwQcDmKbVtVFdvO+BDj71VLrMK2PTPCBIC/QPpGDRQsDAFQA8G5aTwHv65iBKVL6qzq0BA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675075545382669.4592590963717; Mon, 30 Jan 2023 02:45:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMRf8-0006yu-M1; Mon, 30 Jan 2023 05:45:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMRel-0006v2-5G for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:44:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMRej-0001a8-IJ for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:44:58 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-93-FBneMZdePQiMpgDpqL82lQ-1; Mon, 30 Jan 2023 05:44:51 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0EE133C0F420; Mon, 30 Jan 2023 10:44:51 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id D239E492B01; Mon, 30 Jan 2023 10:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675075497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v7GI/MD5ZaL5dkXpJYBjXMF4QyvJErgyxsGf8fwFHwo=; b=KED2+3JLtAldCw0XHcNZo0RTLxb/5JngIKPMyq2sfMDYL/E1zNhaiw2Z3e18nJcyoQHnx5 RSYHqFdbtiExRY62eUbWpGQPuXqxgVBs8FCGlrSi8LXX40Rohw3g0npID9ggA3v3TIyUHF a36p/rUMCwB3rwPKIzV5gfJD+rpGf5I= X-MC-Unique: FBneMZdePQiMpgDpqL82lQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Richard Henderson Subject: [PATCH 1/6] gitlab-ci.d/buildtest: Remove ppc-softmmu from the clang-system job Date: Mon, 30 Jan 2023 11:44:41 +0100 Message-Id: <20230130104446.1286773-2-thuth@redhat.com> In-Reply-To: <20230130104446.1286773-1-thuth@redhat.com> References: <20230130104446.1286773-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675075546746100006 Content-Type: text/plain; charset="utf-8" We are also compile-testing ppc64-softmmu with clang in the "tsan-build" job, and ppc64-softmmu covers pretty much the same code as ppc-softmmu, so we should not lose much test coverage here by removing ppc-softmmu from the "clang-system" job. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/buildtest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f09a898c3e..406608e5fc 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -316,8 +316,7 @@ clang-system: IMAGE: fedora CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --extra-cflags=3D-fsanitize=3Dundefined --extra-cflags=3D-fno-saniti= ze-recover=3Dundefined - TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu - ppc-softmmu s390x-softmmu + TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu s390x-s= oftmmu MAKE_CHECK_ARGS: check-qtest check-tcg =20 clang-user: --=20 2.31.1 From nobody Fri Apr 19 21:11:01 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675075546; cv=none; d=zohomail.com; s=zohoarc; b=JNqaKB/MAKBc4Kmxugc2t2NB0UetFZMtRE0xdM6ZQtFTts2ttfcTtb2VTGZ7nmlhco4c8+VuiC7FlRRs26iKye/7/wVYBbZi3EwHcQ4pu25nQphvtMZE5bBpIWc05yk2Vr2pI5tPNRGAScFB2i+h5Ku7ufG7CSe9N+zhSWSc2gE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675075546; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VSZ5NKp1uCr891/wgrZNvaoeYR6a56JXgk6Wxgkboag=; b=f/ssP7BV+0Qbmr/fMC6CINv8R6KqqrNZvt6VLP8YVMN34uyocFl7VIHP2k/iOEREfYWgc0CB1tbptInspt3shfba5G+SHaEtD6qPOu2zcIn4KBDCQp+yiY4Xso3cObESsTf5u/tZUA7KpSHixp8Dmeda3QgTGkKeaC8AglSWJUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167507554608436.74992444869281; Mon, 30 Jan 2023 02:45:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMRfN-00070W-Uh; Mon, 30 Jan 2023 05:45:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMReq-0006xL-FY for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMReo-0001cN-Po for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:04 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-32-SaA-s_4UMgaRKGUzixAKRw-1; Mon, 30 Jan 2023 05:44:52 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F6513847986; Mon, 30 Jan 2023 10:44:52 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51ED9492B01; Mon, 30 Jan 2023 10:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675075502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VSZ5NKp1uCr891/wgrZNvaoeYR6a56JXgk6Wxgkboag=; b=XxN2lAsqe3jK3rNmH4m+9kkT2282iriX6JVzxyJpWWLl5qOLj+tem9I/obflS6AgjpUYYx PLFKpVKL67odvRKS2/Tzk++GI212jIedNynj1brX7GspRT3p8HKH/FLBOZdFhutRPc+VGY UONuEdILBzCmntyw3QxtlwPMBZP4r7I= X-MC-Unique: SaA-s_4UMgaRKGUzixAKRw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Richard Henderson Subject: [PATCH 2/6] gitlab-ci.d/buildtest: Remove aarch64-softmmu from the build-system-ubuntu job Date: Mon, 30 Jan 2023 11:44:42 +0100 Message-Id: <20230130104446.1286773-3-thuth@redhat.com> In-Reply-To: <20230130104446.1286773-1-thuth@redhat.com> References: <20230130104446.1286773-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675075546725100005 Content-Type: text/plain; charset="utf-8" aarch64-softmmu is also checked on the same version of Ubuntu in the gprov-gcov job, so it is redundant to check it again in the normal ubuntu job. Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 406608e5fc..7b55dfc434 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -42,7 +42,7 @@ build-system-ubuntu: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-capstone - TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu + TARGETS: alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build artifacts: --=20 2.31.1 From nobody Fri Apr 19 21:11:01 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675075615; cv=none; d=zohomail.com; s=zohoarc; b=TfFTuVdlyl4x7V92pZneqyPd/Q6lP64bCJNH40hog6VQDZQXQAci8GOBNOKZvQDjH3+8KllCYKU0G//rF7aEF12cPF9L68k3goKNwnyxMGT0p2kOOr2Hu3/+JtSO34q6JAkFbD5TULmu+kb4CDejOF2RsxYHnfgk5Txaqs18FDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675075615; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HJElCQr2nWuSL3iyN67l61u7vM5kM2BGZVBIaN/UN4I=; b=AAcKewJt7NzzdIY2cKfsaY4vQ4U23QDkQrTOHDaq20VQhIZQtyca6HOn8qZjksLmnwDjJ1iWGSPjfx4dyY25ACUYSy55fDI9781qJn6wnztfD1tBkmdFxlUODYtFW07mFUoB+Oumb+C7Nrsh92Jfdm0eNy4HseJdn9zkEo2VuJs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675075615847292.88492934229237; Mon, 30 Jan 2023 02:46:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMRfI-0006zK-0i; Mon, 30 Jan 2023 05:45:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMRen-0006wo-1C for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMRel-0001aP-KL for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:00 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-574-DHVYQjLgOXqtFKUSdTfhKw-1; Mon, 30 Jan 2023 05:44:54 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F41021C07552; Mon, 30 Jan 2023 10:44:53 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id C535D492B02; Mon, 30 Jan 2023 10:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675075498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HJElCQr2nWuSL3iyN67l61u7vM5kM2BGZVBIaN/UN4I=; b=eFIukChBfwcDc71aJG4YQoD7WDEQlyz6mXdXOK5AbPhczJX0Geea5yBauzT8ypoDt0leBs imUEmts8XZoPDeUTUMlRXaukNC/FbbS4m0JL+eMdtazsciFXtVLc+rCwB+MtzHLt4Fg9Mj eQLpGQaaFAE7rTsGleOFx54Jvr/UbSs= X-MC-Unique: DHVYQjLgOXqtFKUSdTfhKw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Richard Henderson Subject: [PATCH 3/6] tests/qtest/display-vga-test: Add proper checks if a device is available Date: Mon, 30 Jan 2023 11:44:43 +0100 Message-Id: <20230130104446.1286773-4-thuth@redhat.com> In-Reply-To: <20230130104446.1286773-1-thuth@redhat.com> References: <20230130104446.1286773-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675075617250100005 Content-Type: text/plain; charset="utf-8" display-vga-test currently tries to guess the usable VGA devices according to the target architecture that is used for the test. This of course does not work if QEMU has been built with the "--without-default-devices" configure switch. To fix this, use the qtest_has_device() function for the decision instead. This way we can also consolidate most of the test functions into one single function (that takes a parameter with the device name now), except for the multihead test that tries to instantiate two devices and thus is a little bit different. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson --- tests/qtest/display-vga-test.c | 65 +++++++++++++--------------------- 1 file changed, 25 insertions(+), 40 deletions(-) diff --git a/tests/qtest/display-vga-test.c b/tests/qtest/display-vga-test.c index ace3bb28e0..1a26a66061 100644 --- a/tests/qtest/display-vga-test.c +++ b/tests/qtest/display-vga-test.c @@ -8,61 +8,46 @@ */ =20 #include "qemu/osdep.h" -#include "libqtest-single.h" - -static void pci_cirrus(void) -{ - qtest_start("-vga none -device cirrus-vga"); - qtest_end(); -} - -static void pci_stdvga(void) -{ - qtest_start("-vga none -device VGA"); - qtest_end(); -} - -static void pci_secondary(void) -{ - qtest_start("-vga none -device secondary-vga"); - qtest_end(); -} +#include "libqtest.h" =20 static void pci_multihead(void) { - qtest_start("-vga none -device VGA -device secondary-vga"); - qtest_end(); -} + QTestState *qts; =20 -static void pci_virtio_gpu(void) -{ - qtest_start("-vga none -device virtio-gpu-pci"); - qtest_end(); + qts =3D qtest_init("-vga none -device VGA -device secondary-vga"); + qtest_quit(qts); } =20 -static void pci_virtio_vga(void) +static void test_vga(gconstpointer data) { - qtest_start("-vga none -device virtio-vga"); - qtest_end(); + QTestState *qts; + + qts =3D qtest_initf("-vga none -device %s", (const char *)data); + qtest_quit(qts); } =20 int main(int argc, char **argv) { - const char *arch =3D qtest_get_arch(); + const char *devices[] =3D { + "cirrus-vga", + "VGA", + "secondary-vga", + "virtio-gpu-pci", + "virtio-vga" + }; =20 g_test_init(&argc, &argv, NULL); =20 - if (strcmp(arch, "alpha") =3D=3D 0 || strcmp(arch, "i386") =3D=3D 0 || - strcmp(arch, "mips") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - qtest_add_func("/display/pci/cirrus", pci_cirrus); + for (int i =3D 0; i < ARRAY_SIZE(devices); i++) { + if (qtest_has_device(devices[i])) { + char *testpath =3D g_strdup_printf("/display/pci/%s", devices[= i]); + qtest_add_data_func(testpath, devices[i], test_vga); + g_free(testpath); + } } - qtest_add_func("/display/pci/stdvga", pci_stdvga); - qtest_add_func("/display/pci/secondary", pci_secondary); - qtest_add_func("/display/pci/multihead", pci_multihead); - qtest_add_func("/display/pci/virtio-gpu", pci_virtio_gpu); - if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64") || - g_str_equal(arch, "hppa") || g_str_equal(arch, "ppc64")) { - qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga); + + if (qtest_has_device("secondary-vga")) { + qtest_add_func("/display/pci/multihead", pci_multihead); } =20 return g_test_run(); --=20 2.31.1 From nobody Fri Apr 19 21:11:01 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675075551; cv=none; d=zohomail.com; s=zohoarc; b=WJ88r+e1XS+mZcPu0h6kwAJnmYywdp4/MCM9qBD9evK+WO8O9Tjoas7Q/4u8nFZ3lvQNuHr3b+q1Ppy0XnGyyTx2s4e6T2z+TnKnBSyT/cQJYU6VDldYaJC605XmX/jFFV1tOqwQny8zDMAxy6w1DNjeQC56e9d2o97aI/VYT78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675075551; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v88776tWlakTfjNPwGSWpvVvWkoHCtXkriPOV47jGXs=; b=RNBACsNwhgsxbjWocUQdBp4ZIl4Iw2CpPHb/IDl1APLDN50Tlfa/Y5ZOSVGLq9tVVGFUNC+xJa+cJLRHAs6liM/uVeiYjnZsRwPLfp0Wfxvaa/Yo12AHRQIR/hhF0tu1Es2ehC2TwFJRyBMgpP/pdUiSit8IhzniA39JwTq6DlQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675075551171196.3692961639042; Mon, 30 Jan 2023 02:45:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMRfK-0006zV-12; Mon, 30 Jan 2023 05:45:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMRep-0006xI-8B for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMRen-0001bt-Ky for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:02 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-401-OPmhFlCHOI6c_c1OLPdHsA-1; Mon, 30 Jan 2023 05:44:55 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78D953847984; Mon, 30 Jan 2023 10:44:55 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43CD0492B01; Mon, 30 Jan 2023 10:44:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675075500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v88776tWlakTfjNPwGSWpvVvWkoHCtXkriPOV47jGXs=; b=PHrXLlN8dDjGPrqqPj677MklCXWawc8JLYyJwbQMJyTrGTdDFZEYGu4JJ4xVlCVw7JvD/F hq7neoDOWGOFeF+sd4Rn/0I+H0Y0RLe74g1tH8rabhWguzZiTxHImrf2uFRfiRAJDvl0X+ dlAxxz9DrIOeJyXqws4GdUdKy9OpvCc= X-MC-Unique: OPmhFlCHOI6c_c1OLPdHsA-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Richard Henderson Subject: [PATCH 4/6] gitlab-ci.d/buildtest: Merge the --without-default-* jobs Date: Mon, 30 Jan 2023 11:44:44 +0100 Message-Id: <20230130104446.1286773-5-thuth@redhat.com> In-Reply-To: <20230130104446.1286773-1-thuth@redhat.com> References: <20230130104446.1286773-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675075552686100003 Content-Type: text/plain; charset="utf-8" Let's safe some CI minutes by merging these two jobs. We can now also drop "--disable-capstone" since the capstone submodule has been removed a while ago. We should rather tes --disable-fdt now to test a compilation without the "dtc" submodule (for this we have to drop i386-softmmu from the target list unfortunately). Additionally, the qtests with s390x and sh4 are not read for "--without-default-devices" yet, so we can only test mips64 and avr here now. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Fabiano Rosas Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/buildtest.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 7b55dfc434..86f9c37a07 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -557,29 +557,22 @@ build-coroutine-sigaltstack: MAKE_CHECK_ARGS: check-unit =20 # Check our reduced build configurations -build-without-default-devices: +build-without-defaults: extends: .native_build_job_template needs: job: amd64-centos8-container variables: IMAGE: centos8 - CONFIGURE_ARGS: --without-default-devices --disable-user - -build-without-default-features: - extends: .native_build_job_template - needs: - job: amd64-fedora-container - variables: - IMAGE: fedora CONFIGURE_ARGS: + --without-default-devices --without-default-features - --disable-capstone + --disable-fdt --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: avr-softmmu i386-softmmu mips64-softmmu s390x-softmmu sh4-sof= tmmu + TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user - MAKE_CHECK_ARGS: check-unit check-qtest SPEED=3Dslow + MAKE_CHECK_ARGS: check-unit check-qtest-avr check-qtest-mips64 =20 build-libvhost-user: extends: .base_job_template --=20 2.31.1 From nobody Fri Apr 19 21:11:01 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675075665; cv=none; d=zohomail.com; s=zohoarc; b=e2ZYBUW/1UmHwp0lAVbwPvUbUrnxDIHcol94vK+2YQtf5AikTy7D4UAynOiFG0UbDJFEUNyxuVit4P73ROi6q/be4Q6GwM7oyL+XJ4vmv0jd3NhNLA3L8dIOhXZzpWQif1HmuC7TKgP6KjIzQQzUMOBoD3tWD6qBDP471fJpPMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675075665; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DcFgvhRaQ60Gbtv7hsrzYZssnFeJy3XNKfz0fYCSwsA=; b=XBc+prsKZtqVU9cm3hr6Beil4dmvqBXunyGAu+Ddf22CVMeN3BWOFZu4YTimIoeMWFaeaRnjWuiLib8Rn/ISFCLL3uq50AOUEc68K2h/yYX6AIrp38yQPDidtJ79jiKKrHLvft9b6xwNEd02WAuaQ8o1+fxhe+16ERSC6AoDDSE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675075665084899.5592975771384; Mon, 30 Jan 2023 02:47:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMRfE-0006zD-5I; Mon, 30 Jan 2023 05:45:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMReq-0006xK-Fl for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMReo-0001cK-Aa for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:03 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-Qxru__3IOvqU0nWcOieOGg-1; Mon, 30 Jan 2023 05:44:57 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9613101A52E; Mon, 30 Jan 2023 10:44:56 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB7F1492B01; Mon, 30 Jan 2023 10:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675075501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DcFgvhRaQ60Gbtv7hsrzYZssnFeJy3XNKfz0fYCSwsA=; b=c3xTINrw+WH/eSZSJ6Nl+MDu82EpCwSg0B28wi+pK9eAEuA4MqZdWI/s2V+m7xpQatjmhZ vb3CHLryZoIoRRNeuSkjuQNCXaEB/z4zYVs0XvGEJhcjb8NIz3EBl7IbA7UnPjeXVcRN0r c6giq5E6sYhha4VHbo2YJB3x4UPA6V8= X-MC-Unique: Qxru__3IOvqU0nWcOieOGg-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Richard Henderson Subject: [PATCH 5/6] gitlab-ci.d/buildtest: Merge the two gprof-gcov jobs Date: Mon, 30 Jan 2023 11:44:45 +0100 Message-Id: <20230130104446.1286773-6-thuth@redhat.com> In-Reply-To: <20230130104446.1286773-1-thuth@redhat.com> References: <20230130104446.1286773-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675075665444100005 Content-Type: text/plain; charset="utf-8" There is only one job depending on the build-gprof-gcov job, so there is no real need for keeping this separate. It likely only has been split since the complete runtime is more than 60 minutes, but that can be better handled with a proper timeout setting instead. By merging the two jobs, we safe some precious CI minutes for starting a new container for the second job each time. Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 86f9c37a07..91c7467a66 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -468,26 +468,15 @@ tsan-build: MAKE_CHECK_ARGS: bench V=3D1 =20 # gprof/gcov are GCC features -build-gprof-gcov: +gprof-gcov: extends: .native_build_job_template needs: job: amd64-ubuntu2004-container + timeout: 80m variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-gprof --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - artifacts: - expire_in: 1 days - paths: - - build - -check-gprof-gcov: - extends: .native_test_job_template - needs: - - job: build-gprof-gcov - artifacts: true - variables: - IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check after_script: - cd build --=20 2.31.1 From nobody Fri Apr 19 21:11:01 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675075623; cv=none; d=zohomail.com; s=zohoarc; b=DxaOnfh/MBBW0BB5L5RgfuHCNzpo2K2+ShPf/uX9p639gUV5tKvsaAHInbPAMJiHwkQXGtiFzuQNjSef/ej/S9rhj0gpMEcMLoTjSfbS8y9A425ihXKRR0/BNT86sbVcv7BtMRXuYEHEqte7oLmRKSlfuDpvxIQ1Kh/Pd0OUV3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675075623; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bPypfQ4VM4lDu8MTFVa/HYXT3hVREerknkebOVnDhYk=; b=PkkWrZ271RY1nOUk/6PgDdQx6bn+LaiNz3u/98f55KD5ChU2UkRyhJNO5pQPzFzGPaMYy9HqGMIcQImDuiGB+yO04sscrrv/IGtQtR3zHbExR7Gf9yiUvlLPAlmrV79EDZSEKvJFPaMxT7+U+1gx69hSQ8HvL+Chh6Nn2studtM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675075623865105.76228592106725; Mon, 30 Jan 2023 02:47:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMRfK-0006zW-2E; Mon, 30 Jan 2023 05:45:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMRey-0006yG-1R for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMRew-0001nh-Ky for qemu-devel@nongnu.org; Mon, 30 Jan 2023 05:45:11 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-6-szQDv_K2OASa6b4iaCyxcA-1; Mon, 30 Jan 2023 05:44:58 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 61C79800B30; Mon, 30 Jan 2023 10:44:58 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id 376C0492B01; Mon, 30 Jan 2023 10:44:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675075510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bPypfQ4VM4lDu8MTFVa/HYXT3hVREerknkebOVnDhYk=; b=UL40bzn4N42iFfsrQLtbrCp/+wB+jbDSiZ6A6GvuXzOa2v9ljfvP4HJ9Lwd49LgH67OErL /TAgH45OfYlDcQZIN8iD9vNxrE3d6oTWXodTbEXpTjzXZaauHqtzVO/GCoEfbLASE4Kfyw qsJM2U03dw4yQVpwigWlAm4can//mJk= X-MC-Unique: szQDv_K2OASa6b4iaCyxcA-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Richard Henderson Subject: [PATCH 6/6] gitlab-ci.d/buildtest: Disintegrate the build-coroutine-sigaltstack job Date: Mon, 30 Jan 2023 11:44:46 +0100 Message-Id: <20230130104446.1286773-7-thuth@redhat.com> In-Reply-To: <20230130104446.1286773-1-thuth@redhat.com> References: <20230130104446.1286773-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675075625245100003 Content-Type: text/plain; charset="utf-8" We can get rid of the build-coroutine-sigaltstack job by moving the configure flags that should be tested here to other jobs: Move --with-coroutine=3Dsigaltstack to the build-without-defaults job and --enable-trace-backends=3Dftrace to the cross-s390x-kvm-only job. Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 14 ++------------ .gitlab-ci.d/crossbuilds.yml | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 91c7467a66..1438797a1c 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -533,19 +533,8 @@ build-tci: - QTEST_QEMU_BINARY=3D"./qemu-system-s390x" ./tests/qtest/pxe-test -m = slow - make check-tcg =20 -# Alternate coroutines implementations are only really of interest to KVM = users -# However we can't test against KVM on Gitlab-CI so we can only run unit t= ests -build-coroutine-sigaltstack: - extends: .native_build_job_template - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack --disable-tcg - --enable-trace-backends=3Dftrace - MAKE_CHECK_ARGS: check-unit - # Check our reduced build configurations +# (and an alternative coroutine implementation) build-without-defaults: extends: .native_build_job_template needs: @@ -559,6 +548,7 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip + --with-coroutine=3Dsigaltstack TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check-unit check-qtest-avr check-qtest-mips64 diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 8dbbb8f881..027d2088da 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -159,7 +159,7 @@ cross-s390x-kvm-only: job: s390x-debian-cross-container variables: IMAGE: debian-s390x-cross - EXTRA_CONFIGURE_OPTS: --disable-tcg + EXTRA_CONFIGURE_OPTS: --disable-tcg --enable-trace-backends=3Dftrace =20 cross-mips64el-kvm-only: extends: .cross_accel_build_job --=20 2.31.1