From nobody Fri Apr 3 19:26:41 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774281513; cv=none; d=zohomail.com; s=zohoarc; b=ggoUNyIeucHZvwbfUTB88AWh0h35hYlu04p81qD5ljDOPdq8/wo7kDBY4g8kl3MStClyq7uRoKTBHQzcfmjaAcjgt6C3cUwxr8Z4Jiy5eb81mNUNKpUjGIXB82OjTwwZAl3KzQKJbohm/XywJDrC9SFELDy6nAM+Rtc1fLSDHNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774281513; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WDq7L8VxJbWEl+g0lwQ7GIiMPhaC6/ZfTXLocURTGgs=; b=f/pRU4C6vuEhBCN1QOMXIELO8ZWwOL/08g499wMkPycJje+AW88ffCnanrE8rJCfdyjvKX+RLeYqg2Cvv7lzRXR+tWcVfjL+sSgMGiE0t7oN0n/pQRGekHJarfcV3/klQjHFzJ9nOrJCeELWlLYgmpW4EftBrmCVRLZm8Jzxudk= 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+importer=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 1774281513095761.8309708723916; Mon, 23 Mar 2026 08:58:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4heP-0005La-51; Mon, 23 Mar 2026 11:57:09 -0400 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 1w4he2-0005Ed-QU for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:49 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w4he0-0007t4-7N for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:46 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-b9841aecf72so335798366b.2 for ; Mon, 23 Mar 2026 08:56:40 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b983365a159sm502508766b.44.2026.03.23.08.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 08:56:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 00C875F7F5; Mon, 23 Mar 2026 15:56:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774281399; x=1774886199; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WDq7L8VxJbWEl+g0lwQ7GIiMPhaC6/ZfTXLocURTGgs=; b=RB82YbNuKrh4kibTdwGu7nBo3R2Czm8a519qwAVdhhxgIqglJSYEXNiqFFurRFNrXv Ff9wEivhoMHxOOLKQN4ZekBxACAi57gtMvsmiGS8/sp9f7Us0gSqBJ5Qn/0ph+dSEitZ RA6h1SkBX+x5LinjpyC9iJZw5UeRlhDZHLxsiVFwFszJ9/fq2o6kSM++V2r0GmMpxE5v b0kvE280kNnAbVGrgCz5NT+CFIwQQsoqVgImCuockH/XCekcjeYPoerUiR5Z6P41yDG2 vEmWmNvgyMPw81kBfScMYPzJXUH9lTvG9xvaXQdQ7CmJb6OHUsLZwkPlvHYQ2xyEPnss Et1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774281399; x=1774886199; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WDq7L8VxJbWEl+g0lwQ7GIiMPhaC6/ZfTXLocURTGgs=; b=JnJsGJ8gQKr8yjD0RWuyJ6iBkSz9JtaCDxNn92iaA4HRxwQ8w3/y2Dh6+CN0Dt6V2n bPyQXP4i7YNvXr7K1VLV5waT7eT0IrjNCS0P6HLTXdxm7gYMKXElAW8PpGJefeNnHGKG CRgu332gokshqHvI94K5N9S/yW6k9DeKdFW7K0Ns5ff2egVj27cwMDl1Z1HVJDzEOUxt +lyUWkGBjaws44nBWMYMiKw3X/DDsbogzXikW7iOAf32FYWuNGX7AvQ3VnNlPDVcK/0p kg/0FhHYonj29X2/km6MBTf+jg1TIgKLU1A7ALJbixr5NqNG2Oc5oUy0xwcNEgVEQoAk qn/w== X-Gm-Message-State: AOJu0YyrIx8mAkO0DrWJ2qsMDxC4JH61SpFTmxKrFYXhN/1BacqGw81s weXXOaJU7/jnK5tW8cHV4FKzpu7/ee8X2WVvX+GsQaYk56yOkiwD44F4cGOCJpC902o= X-Gm-Gg: ATEYQzwWbiZoAHv7K1dy5irbo6DiwTLPYaf8NJXFVDQY7GqCS5sDmv4gYG8iz7PIYPT OBsFYVT8HbX/ygXLaoxIbb1J/58AW6oEqWRUL3w0zWRKW/iz2/hwMwEMUOJ1TeWPtUFWhmlrTHx IttWgPQCw6sr3qH5EwmZaiM8EgXJP6ohI3suUEtlOtnm1Ys8AwMluy+cC8vtT1hFuWrt50Wr+dT ICDRcyfkjIV6GSYqTZ1wdFhPYmlxi3U4sc+uiblfbayq/ZvttbSiekKr1TxI3/LtidTwlpumage aIQiFN/aHq+C7oiG/8ZTANVc1gCe+VJTmi3uizDitoO73KWwV8WNf+tI6uk9G14NsYrh8ZaYdCm o3TuInfYhIteyTt3laSO1nMPUGPF62rJOjjvhOX+mKNcgtA9xACODVaMgiZpf44OKGTWDz9tK16 7udslOqAKE73Fsu6GKAFi7aDo= X-Received: by 2002:a17:906:6a22:b0:b98:4b50:ac3c with SMTP id a640c23a62f3a-b984b50ad49mr644273166b.27.1774281399386; Mon, 23 Mar 2026 08:56:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 1/8] tests/tcg: allow filtering of TCG tests Date: Mon, 23 Mar 2026 15:56:30 +0000 Message-ID: <20260323155637.145015-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323155637.145015-1-alex.bennee@linaro.org> References: <20260323155637.145015-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774281514613154100 We have a lot of TCG tests now which can be fiddly if we just want to check one particular test type across the targets. Introduce TCG_TEST_FILTER to allow this: make check-tcg TCG_TEST_FILTER=3Dgdb to run all the gdb tests across the suites. Reviewed-by: Pierrick Bouvier Message-ID: <20260320155107.2143191-2-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/Makefile.include b/tests/Makefile.include index 59b9a4b9220..f257288194d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -16,9 +16,11 @@ check-help: @echo " $(MAKE) check-tracetool Run tracetool generator tes= ts" @echo " $(MAKE) check-block Run block tests" ifneq ($(filter $(all-check-targets), check-softfloat),) - @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" - @echo " $(MAKE) run-tcg-tests-TARGET-softmmu Run TCG tests for a given t= arget" + @echo " $(MAKE) check-tcg Run TCG tests" + @echo " $(MAKE) run-tcg-tests-TARGET Run TCG tests for a given t= arget" + @echo + @echo "The variable TCG_TEST_FILTER will select the subset of matching te= sts." endif @echo @echo " $(MAKE) check-report.junit.xml Generates an aggregated XML= test report" @@ -64,7 +66,7 @@ $(TCG_TESTS_TARGETS:%=3Dbuild-tcg-tests-%): build-tcg-tes= ts-%: $(BUILD_DIR)/tests/ .PHONY: $(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%) $(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%): run-tcg-tests-%: build-tcg-tests= -% $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=3D$(SPEED) ru= n, \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=3D$(SPEED) TC= G_TEST_FILTER=3D$(TCG_TEST_FILTER) run, \ "RUN", "$* guest-tests") =20 .PHONY: $(TCG_TESTS_TARGETS:%=3Dclean-tcg-tests-%) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index af72903f898..1b83824ff4e 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -254,8 +254,15 @@ endif gdb-%: % gdb --args $(QEMU) $(QEMU_OPTS) $< =20 +# Filter tests based on TCG_TEST_FILTER if set +ifdef TCG_TEST_FILTER +FILTERED_RUN_TESTS=3D$(foreach test,$(RUN_TESTS),$(if $(findstring $(TCG_T= EST_FILTER),$(test)),$(test))) +else +FILTERED_RUN_TESTS=3D$(RUN_TESTS) +endif + .PHONY: run -run: $(RUN_TESTS) +run: $(FILTERED_RUN_TESTS) =20 clean: rm -f $(TESTS) *.o $(CLEANFILES) @@ -269,3 +276,6 @@ help: @echo "Built with $(CC)" @echo "Available tests:" @$(foreach t,$(RUN_TESTS),echo " $t";) + @echo "" + @echo "Environment variables:" + @echo " TCG_TEST_FILTER=3D Filter tests matching pattern" --=20 2.47.3 From nobody Fri Apr 3 19:26:41 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774281451; cv=none; d=zohomail.com; s=zohoarc; b=RXCPeWLJajRPkHyjtXMklu/uwLbic1Iswikh4jscDDooAllp+Q+t9rMJwmwGNIgNeWuPhJoX/CO0jj+Tb+iirELJUHDqKe609QSmOKrYl22p5b09rcWk+W3SmaooHlnIHvyA5FzKpwnBh9JnriockWoLjAQJeF/vFCA76rRwXOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774281451; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kcNNN6LnbCh2h/xUZIidQ+ou/aw5Az+bDe3k4kAEWNk=; b=MsRB2g6adQywLfIR56bKk7bbeNLuhtsbRkxWelS91Uf6SfhdaSBXP5MdhMUDQ4jiOYXmFanZlkSoQcyqVklFyIYVnVXFL5RnJxsTGtYxb87DP4OVEuzDzeJNHT4ZwU8LAaecElOZb5GLu3QzAMXu7/U62B1677pd2p98B7BH6Vo= 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+importer=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 1774281451403188.88750517985216; Mon, 23 Mar 2026 08:57:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4heJ-0005Jl-ND; Mon, 23 Mar 2026 11:57:03 -0400 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 1w4he3-0005Ef-1X for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:50 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w4he0-0007t6-AN for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:46 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-b97ed4ad579so471589066b.3 for ; Mon, 23 Mar 2026 08:56:41 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b983e4e9b65sm409956366b.31.2026.03.23.08.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 08:56:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 138FA5F81C; Mon, 23 Mar 2026 15:56:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774281400; x=1774886200; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kcNNN6LnbCh2h/xUZIidQ+ou/aw5Az+bDe3k4kAEWNk=; b=XoD77l0zjoeKfSQVRJYARIVaeZYil3HZLlsY1/9Yjy1+86jYmExmsGZPlQ2DgsI8tV gq2jhsc7Kd8zCqEhPtktFOvFIBNe/A70JSBYFXAhZ+IpzMFFjLFdBXUNGCtcKuJRVmgX IBrE2zTIQgbyzNyNNzQBCvXNJxUi0MB8noofLPPeXN1YuP/gIEG29r61kZN06sLEBVHd dt+qrwT4Ww+zQO2Tpjwn2B9ngkA5uyea/SL++6drQMBfdFiI9Ss6sU7iBKK4zn9N1fR5 Bef7UXz2Y7/LSvBxQe+RBV5dCus8cddUmLxfm59y8WkfSXvOrGg0GxYp9lZzYG8CJjcd EEyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774281400; x=1774886200; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kcNNN6LnbCh2h/xUZIidQ+ou/aw5Az+bDe3k4kAEWNk=; b=hEsgIClA6Q+Bc7dON6sQReqNitoespSTGS2QL+/u8tdeoQ/hwsXJtC1T0AZmY0s3Sg HxhORcI3kBclaGB8pRNZVy/qCRDOMWQVRJZQctGOuccGX4rGkVH4XTlh9KWYT+x8qgVu 7uH9b7mwatBCVepO8SCzxGMzdMC7hSnGj+VcfRMeiP/ohZnib6TmhNMav4fwUAPB7QdG TeasbDevCO1HvTUQ8UqNheIURtAH5U6FKi1CgfCUd22Hn9HTlz7OkyJUxyYd0VLgBAf7 d1ugPYGL4aVQYydFeAI2XdRTLILIME8nkFnL9qf2kbi8UuPunC+2Fn1oRH7xCa804UuJ AWxw== X-Gm-Message-State: AOJu0YwsiIbHIUvmDHdAyTHPhStluGGM9xRiw/5tawdBLSCpZQoRl41q BSlDaS9ShIL+I3rB5J9pRvs82SbTbAerJJS1lqGrwIJPXxf6jwwYfVn/T/u64RdgKj8= X-Gm-Gg: ATEYQzzQASlosHf7byZ4GDl3ztNzDhkcPwUuoQyeKPGVP8jQ1xA5Y9aBmh6qJBjYUHC YRAjSoVQzMZw76d49EVdSADUTWna+co9kax/xCgaErdtVQyBp0MSllgMqD7H7vOx37+MaW7nHm0 9FCNsjsz+7OPPOWfvPiNhzF+ux1qBla4mXol7P6JmxgXozWXbB7aVSUzzFRyFrZdDyCmyV97P/n 2xQxm1cRbr5q/dASxUb0Zrq5pgpJsjEpYly2zO5R/C08HPP/o9vHi4dHB0LJo2IMxwiWYT5zBF2 Iy4Cvajyv8x0mUHNpzPNE7rs1K1OC+hX/fkcY6Uy4dTG9CSUQK5gagWnAo0VXsTmDzrWiNJo7Rf nnRwRBNrybUF6pi1OcThDCx/f4zTxr3U3T6LtWQwvKRGnNrDV7EklLQVnGWs9w3+g4EdZt1+NFs 0FWsPMdXewc/WJ1AwV0XxDwdw= X-Received: by 2002:a17:907:1604:b0:b97:edc1:f9c4 with SMTP id a640c23a62f3a-b982f1ed7b2mr965827266b.1.1774281399873; Mon, 23 Mar 2026 08:56:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Matheus Tavares Bernardino , Brian Cain , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 2/8] tests/tcg/multiarch/linux-test: use portable alternative for dirent64 Date: Mon, 23 Mar 2026 15:56:31 +0000 Message-ID: <20260323155637.145015-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323155637.145015-1-alex.bennee@linaro.org> References: <20260323155637.145015-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774281452729158500 From: Matheus Tavares Bernardino dirent64 and readdir64 are glibc-specific and not portable to other C libraries such as musl. Define _FILE_OFFSET_BITS=3D64 instead, which portably instructs all libc implementations to use 64-bit file offsets, making readdir() and struct dirent equivalent to their 64-bit variants. Signed-off-by: Matheus Tavares Bernardino Reviewed-by: Brian Cain Reviewed-by: Pierrick Bouvier Message-ID: Message-ID: <20260320155107.2143191-3-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/tcg/multiarch/linux/linux-test.c b/tests/tcg/multiarch/l= inux/linux-test.c index bf6e0fda262..0fa3165602f 100644 --- a/tests/tcg/multiarch/linux/linux-test.c +++ b/tests/tcg/multiarch/linux/linux-test.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ +#define _FILE_OFFSET_BITS 64 #define _GNU_SOURCE #include #include @@ -83,7 +84,7 @@ static void test_file(void) struct utimbuf tbuf; struct iovec vecs[2]; DIR *dir; - struct dirent64 *de; + struct dirent *de; /* TODO: make common tempdir creation for tcg tests */ char template[] =3D "/tmp/linux-test-XXXXXX"; char *tmpdir =3D mkdtemp(template); @@ -191,7 +192,7 @@ static void test_file(void) error("opendir"); len =3D 0; for(;;) { - de =3D readdir64(dir); + de =3D readdir(dir); if (!de) break; if (strcmp(de->d_name, ".") !=3D 0 && --=20 2.47.3 From nobody Fri Apr 3 19:26:41 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774281449; cv=none; d=zohomail.com; s=zohoarc; b=GJMLTtQt5t+QDackMpiBg1Q1rdFoizuKTvNQm8T89cXSWwtKUXCMUVgcs2dJDF9D+ChBeT0FTQsj46C1cGwmZTjMbyxDbT9Qjqk+SXKTjsiM/UOuy1WeZrOrhblCt9I290e5S3ihUGxTEex6qfaaqRX5Rq2FVMB6TD9bnInJXzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774281449; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ehmEJNcEUvWR4p1pxJZuNpiKpsAzgjyq2kLYhXCKaxg=; b=LmTsPnF3w+tsaueFs32EUJRX5rFoqNPhXBe9nNob/LLwZBFFjcZBsxkh5rJgWW5fz9h1geqQtMJb8n2AcPDg25AFWBxOQRJkYUNCEUVfUO1JNfQhya0UitLgwgl3OOFowVl8GPTS5dybxCti2OJ3l0kjgnPScWuoXd5aMqMgw1w= 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+importer=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 1774281449013714.47784734751; Mon, 23 Mar 2026 08:57:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4heO-0005Kv-13; Mon, 23 Mar 2026 11:57:08 -0400 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 1w4he2-0005Ee-UZ for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:49 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w4he0-0007tB-F8 for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:46 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-6611f41eebcso644583a12.2 for ; Mon, 23 Mar 2026 08:56:41 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b983365a14csm496397766b.43.2026.03.23.08.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 08:56:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 25E6C5F855; Mon, 23 Mar 2026 15:56:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774281401; x=1774886201; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ehmEJNcEUvWR4p1pxJZuNpiKpsAzgjyq2kLYhXCKaxg=; b=ApzlY98u3NAVIs618n5GijkFL+wfswyMQhWUXbWkfCgXhzfrGuxdaddfLuPEBchIzj loaVGmheBVL0aVdmzD6rhnA1PJ0s96SE9AToGvftKVQtu767tJG5MQ4AEoHz0K7pNJRn Xaf5KP62x8xXh9Ufa8h3oLivnYJSA4x+6PXYh3/HhAyQsDg5jmtpqo9HE/LHaSoHBTw2 2TYORB1mMQS4o80uQGxlZ/NR5/vpSxNqOVZBrp6RytqgICoBhpM91Q8XvcGXZPEUqADu JmgfjIoMJga94fZXM+Js443tv3nqemh37ifRJ2I6p/YwJ3f1ElupTQsNxaqjxHnEj1ak YgIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774281401; x=1774886201; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ehmEJNcEUvWR4p1pxJZuNpiKpsAzgjyq2kLYhXCKaxg=; b=CxsRtlMxmO4y5eXbDnIJ7X3Cmm6oO8NDGCJtsdPPo2Vs5liJpoSd88pY0V2CdDF/oP r/pFOHHT10fHimzZYHsJakABMV9qJPaZA9NUdQAQCjw1hKhlnvt1DakXIm9ze4TyDjzK lQEkc4eD/35yCWgWG312MQ8kwK826jE1XOrHqb7K6M2asu4l/5LT0eHSWupOzwaJYfmN IXgATzZw6yEPiO4Mu7E218IKDivbJbzPZQtC3xP1I3DK+FZdQdFtMu8JKmPGqIXgg+AF TrMrGGhSPOjgAWZZ2aOY0Yv7IeJTd+nGleoupFQtVAq/417TDxtszMUHPYLfh0jfZQzg qrhQ== X-Gm-Message-State: AOJu0YwLrz/qoKrpF00bbrR8YEKKc0knslSQNL8zgl/+NKT5BS/zbKus EplCLrvENopacPtqEEDZNYKJ80PofuqZJb+22Ll8ZVh5oCi4NubqV87N0uceojW37NI= X-Gm-Gg: ATEYQzyxMZrgZvZ9WRNecebIVH/+s4UpafqU+pIJdgEP+PPx7nybsQf6NG8UAzc4Bve DBgBDIGEJ0vGhSo4uKIMajPf/WabAg9QPJzGhGkVNqfN458iHs6HNJhw4qc5l9OpbnfqFMmzDQ0 alzQ/Dkw5Fpt+VuYabLLARTwcI6ffNbyGZFHNrx2MZNp5ClgKa0IYT7wIIz0E/tIhrUEIdrGuuk j18DEzSDCmlA2mMw3fC1eF8LaWLT3mPYMj20vJde8iHp53SmnCFm8UHF3xVdJokA762y3X+Frhl /zB3VigGvhC4J5sMBdire3oDyYrPCFq0Yi/R9MDJ+5iPMfz7XTEzPteAVh5DD4GxDFgwWSqC6tl r1I6uCNd5QlaNWOZ22B0VD/NSmd7Pz5HRkXP991zFxSw8eOLEcWlWYz0P8miKGyzcLyYbfU/c7V NzaSigmZmNPZoiBhE+Wrg+JH8= X-Received: by 2002:a17:907:7fa3:b0:b98:4799:e6de with SMTP id a640c23a62f3a-b984799e8afmr721698766b.48.1774281400671; Mon, 23 Mar 2026 08:56:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 3/8] tests/functional: allow tests to define decompression target Date: Mon, 23 Mar 2026 15:56:32 +0000 Message-ID: <20260323155637.145015-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323155637.145015-1-alex.bennee@linaro.org> References: <20260323155637.145015-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774281450938158500 When dealing with multi-stage decompression we want to specify the target file name lest we just overload the cache name. It also allows for something is little more friendly than the cache hash. Reviewed-by: Pierrick Bouvier Message-ID: <20260320155107.2143191-4-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu= _test/testcase.py index c2c916f6077..eaec1bea138 100644 --- a/tests/functional/qemu_test/testcase.py +++ b/tests/functional/qemu_test/testcase.py @@ -35,7 +35,7 @@ =20 class QemuBaseTest(unittest.TestCase): =20 - def uncompress(self, compressed, format=3DNone): + def uncompress(self, compressed, target=3DNone, format=3DNone): ''' @params compressed: filename, Asset, or file-like object to uncomp= ress @params format: optional compression format (gzip, lzma) @@ -52,8 +52,11 @@ def uncompress(self, compressed, format=3DNone): if isinstance(compressed, Asset): compressed.fetch() =20 - (name, _ext) =3D os.path.splitext(str(compressed)) - uncompressed =3D self.scratch_file(os.path.basename(name)) + if target is not None: + uncompressed =3D self.scratch_file(target) + else: + (name, _ext) =3D os.path.splitext(str(compressed)) + uncompressed =3D self.scratch_file(os.path.basename(name)) =20 uncompress(compressed, uncompressed, format) =20 --=20 2.47.3 From nobody Fri Apr 3 19:26:41 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774281473; cv=none; d=zohomail.com; s=zohoarc; b=ZjTNpUflOPy9G2yLMLRgv7Qq/p7qx9TATZ1JSg/MOnQKhIx8+wpKFfNJXiYiSKR+TB9fFYHtgnj/+lSmi0/RgXyZjwHLraLuWwXK2VHOG5BaLIN3l/jTXvOxUxYdpkdz8kIuUQ89LKmXsMTl/+ryYLaz5GgR3zOndec/Pko4h2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774281473; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=L4sVo7ipM3ZjIyISVk1iGmWS/zTxx2pGnjJAKAGfU5o=; b=i2Bi3bDirYduUL/JfvyWuvngoN5ui5juuA58sC75KLyzwL2Wi5rXxoUZerbR0gz5HYXQs7hxsugf5ijqMpClA2vUgO0Rfnj5xCMZQ6N9fimk9czTxGp9+5iE+ONYcsTYTKEkJUBgcCa9AWYpf5hsgH9InsZiGY3T5kQK6sMXbg8= 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+importer=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 1774281473521693.456935397038; Mon, 23 Mar 2026 08:57:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4heR-0005Nv-Mq; Mon, 23 Mar 2026 11:57:11 -0400 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 1w4he3-0005Ej-BR for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:50 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w4he0-0007tP-Hf for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:47 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-b9825ba7f9dso482524866b.0 for ; Mon, 23 Mar 2026 08:56:44 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9833663137sm520102566b.49.2026.03.23.08.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 08:56:38 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 389C95F878; Mon, 23 Mar 2026 15:56:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774281403; x=1774886203; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L4sVo7ipM3ZjIyISVk1iGmWS/zTxx2pGnjJAKAGfU5o=; b=GB5i2dTvd/sy7BQgveuWAp+zObG5yby2uLMeO/1QBy40xBS6Cdbca7F++Pzn6yavpE RataaFszml7D23qW3BHgDQK2iwlmNv/LeVe8ie/+aBsxrNnFaerTaKOPolLSysvC9y+z IXGfGLTj0DFLjS2qMRA23gTvReGijPkOKS2pUeyrmegS0EfD10XkEStBxEIkuS2RYjKS NVyQnGAjzVgdt0RU533BX04q30aC0ifmC5BSuE7RnQp/nznpavl3ck8tV0aGmRoyW5V6 0LxlCOfbAiigvDpLylwnQ4XVJ6zr37vL5plKGugmX/J11J9jed2DDTNV2oPR/qX8d8yp cajA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774281403; x=1774886203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=L4sVo7ipM3ZjIyISVk1iGmWS/zTxx2pGnjJAKAGfU5o=; b=NgGxRWdp1vjCsyIBmlGdRYMoYbrz6X99yh1ow6lD+Y0JUL/AKdH4b5pGWvJs0kWU9b W7wGOA7azqbKoyrIURTzjB9Z5hM4aXAx9r+nKE9wklKh/S7Y1XvV9MJoBKE0NP56RnnM MJiPPb9ioerg3l0Jm71TxYLRpxBiumCXmU+1wwXINQAqXv2jH/iZy9Qk+L731DRe+KKr fU1rj2MJpOghTW9Hvf6GRqmEgvEmLRFZoCDNUGan0WZIqMaUkdaZxO4FvWTPeGU6+uox TvQvlPpojgW7pMlHskjQ4oKjwhYYHmvvimUCpoSrcl6muvy16kwa8duRsBuvzcOZUJBR UZEA== X-Gm-Message-State: AOJu0YxRqIZtxja2sAUGFrQdjeR/qoFq8KmiVYkMX07ttz7pv786usk1 G22LlSr8KU51kFZ3Qf0K2NL2z1G3cVER1max9UsgSa7vB2NSfW4dsw8UIW2V0GcuX0w= X-Gm-Gg: ATEYQzwxzj/zvr9NPeMWEDwj+3OR4IIxWOPGA4hCveXqL110PSoXBbxsMI7lVZXnt2H DEUD1MOsAo3e2+VQe8nXoCCNJ4jLG699qoa5BfSTPdUq7SCRxWVP/5zfRLz1fMGW37++s29hDC9 ozyE5niqooxc2M0zHQgLGsRBACH1gDBrdIJvhxgK2/T0tpPjWlMUh7CedBFsXFYVLYh2J/jTJfZ 1/c/dkEsKxijQ741zfv2N9bNpVzoVGnCY+idmrvHTVtnCu9Mq30W6P0XpwYLEBNUWjaSZEaDKNT /KaOATflLIQGqJm3QRJ4BN+xsvqJUurp1bN5PRWgiRpoqu0T7PFsDP/bQ5YM9g6yWtMvW+ApnqU WhlWsUP057djxs2/LMrolOE0D+o3H0tEFIxkDw73byiDwT68dvkPxG53h6bliAeYTea8lcBXLO6 THJfIUyhU7sGcf/tM/o5G9AlM= X-Received: by 2002:a17:907:5c8:b0:b98:3293:ebb3 with SMTP id a640c23a62f3a-b988641045amr5649466b.26.1774281401635; Mon, 23 Mar 2026 08:56:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , Peter Maydell , qemu-arm@nongnu.org (open list:Virt) Subject: [PULL 4/8] tests/functional: add VBSA linux tests Date: Mon, 23 Mar 2026 15:56:33 +0000 Message-ID: <20260323155637.145015-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323155637.145015-1-alex.bennee@linaro.org> References: <20260323155637.145015-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774281476032154100 This extends the VBSA test to run the linux tests. The sysarch-acs test suite does provide some pre-built images which is good because the tests require a patched kernel. However due to the structure of the image we need to jump one or two hoops to get something useful: - download and double decompress (zip then xz) the image - navigate grub to launch the Linux Execution Environment - shutdown the system once tests are done - extract the logs from the MSDOS file system and parse them It does make the code a bit ugly but it works for me at least. So far the subset of tests run is limited but that might be solved by adding some more devices to the PCIe bus to exercise the SMMU behaviour. Reviewed-by: Pierrick Bouvier Message-ID: <20260320155107.2143191-5-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/functional/aarch64/test_virt_vbsa.py b/tests/functional/= aarch64/test_virt_vbsa.py index 1dd4cecde1e..57bfe5d7af2 100755 --- a/tests/functional/aarch64/test_virt_vbsa.py +++ b/tests/functional/aarch64/test_virt_vbsa.py @@ -10,7 +10,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later =20 import shutil -from subprocess import check_call, DEVNULL +import re +from subprocess import check_call, check_output, DEVNULL =20 from qemu_test import QemuSystemTest, Asset from qemu_test import get_qemu_img, skipIfMissingCommands @@ -28,6 +29,20 @@ def wait_for_console_pattern(self, success_message, vm= =3DNone): failure_message=3D'FAILED', vm=3Dvm) =20 + def append_firmware_blobs(self): + """ + Setup QEMU firmware blobs for boot. + """ + code_path =3D self.build_file('pc-bios', 'edk2-aarch64-code.fd') + vars_source =3D self.build_file('pc-bios', 'edk2-arm-vars.fd') + vars_path =3D self.scratch_file('vars.fd') + shutil.copy(vars_source, vars_path) + + self.vm.add_args('-drive', + f'if=3Dpflash,format=3Draw,readonly=3Don,file=3D{= code_path}') + self.vm.add_args('-drive', f'if=3Dpflash,format=3Draw,file=3D{vars= _path}') + + ASSET_VBSA_EFI =3D Asset( 'https://github.com/ARM-software/sysarch-acs/raw/refs/heads/main' '/prebuilt_images/VBSA/v25.12_VBSA_0.7.0/Vbsa.efi', @@ -45,20 +60,12 @@ def test_aarch64_vbsa_uefi_tests(self): =20 self.vm.set_console() =20 - # virt machine wi + # virt machine self.set_machine('virt') self.vm.add_args('-M', 'virt,gic-version=3Dmax,virtualization=3Don= ') self.vm.add_args('-cpu', 'max', '-m', '1024') =20 - # We will use the QEMU firmware blobs to boot - code_path =3D self.build_file('pc-bios', 'edk2-aarch64-code.fd') - vars_source =3D self.build_file('pc-bios', 'edk2-arm-vars.fd') - vars_path =3D self.scratch_file('vars.fd') - shutil.copy(vars_source, vars_path) - - self.vm.add_args('-drive', - f'if=3Dpflash,format=3Draw,readonly=3Don,file=3D{= code_path}') - self.vm.add_args('-drive', f'if=3Dpflash,format=3Draw,file=3D{vars= _path}') + self.append_firmware_blobs() =20 # Build an EFI FAT32 file-system for the UEFI tests vbsa_efi =3D self.ASSET_VBSA_EFI.fetch() @@ -102,5 +109,98 @@ def test_aarch64_vbsa_uefi_tests(self): self.wait_for_console_pattern('VBSA tests complete. Reset the syst= em.') =20 =20 + ASSET_SYSREADY_IMAGE =3D Asset( + 'https://github.com/ARM-software/arm-systemready/' + 'releases/download/v25.10_SR_3.1.0/systemready_acs_live_image.img.= xz.zip', + 'df2c359de15784b1da6a8e6f3c98a053ee38ac0b3f241ccea62e17db092eb03a') + + ROOT_PROMPT =3D '/ # ' + + @skipIfMissingCommands("sfdisk", "jq", "sed") + def test_aarch64_vbsa_linux_tests(self): + """ + Launch the Linux based VBSA test from the ACS prebuilt images. + + We can use the pre-built images and then trigger the Linux + build and run the tests. We then need to slurp the results + from the partition. + """ + + self.vm.set_console() + + # Plain virt machine + self.set_machine('virt') + self.vm.add_args('-M', 'virt,gic-version=3Dmax') + self.vm.add_args('-cpu', 'max', '-m', '1024', '-smp', '4') + + self.append_firmware_blobs() + + # First fetch, decompress (twice) and prepare the disk image + # on an NVME device (the kernel only has drivers for that). + self.archive_extract(self.ASSET_SYSREADY_IMAGE, format=3D"zip") + disk_image_xz =3D self.scratch_file("systemready_acs_live_image.im= g.xz") + disk_image =3D self.uncompress(disk_image_xz) + + self.vm.add_args('-device', + 'nvme,drive=3Dhd,serial=3DQEMU_ROOT_SSD') + self.vm.add_args('-blockdev', + f'driver=3Draw,node-name=3Dhd,file.driver=3Dfile,= file.filename=3D{disk_image}') + + # Tweak grub.cfg default to avoid manually navigating grub + grub_cfg =3D self.scratch_file("grub.cfg") + offset =3D int(check_output(f"sfdisk --json {disk_image} |" + "jq '.partitiontable.partitions[0].start= * 512'", + shell=3DTrue)) + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::/EFI/BOOT/grub.cfg", grub_cfg]) + + with open(grub_cfg, 'a', encoding=3D"utf8") as f: + f.write("set default=3D'Linux Execution Enviroment'") + + check_call(["mcopy", "-D", "o", "-i", f"{disk_image}@@{offset}", + grub_cfg, "::/EFI/BOOT/grub.cfg"]) + + # Launch QEMU and wait for grub and select the "Linux + # Execution Environment" so we can launch the test. + + self.vm.launch() + self.wait_for_console_pattern(self.ROOT_PROMPT) + ec_and_wait(self, "/usr/bin/bsa.sh --skip " + "B_REP_1,B_IEP_1,B_PCIe_11,B_MEM_06", + self.ROOT_PROMPT) + + # Now we can shutdown + ec_and_wait(self, "halt -f", "reboot: System halted") + self.vm.shutdown() + + # and extract the test logs + bsa_app_res =3D self.scratch_file("BsaResultsApp.log") + bsa_kern_res =3D self.scratch_file("BsaResultsKernel.log") + + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::acs_results/Linux/BsaResultsApp.log", bsa_app_res]) + check_call(["mcopy", "-i", f"{disk_image}@@{offset}", + "::acs_results/Linux/BsaResultsKernel.log", bsa_kern_r= es]) + + # for now just check the kernel log for the result summary + test_result_re =3D re.compile(r"\[.*\]\s+(.+): Result:\s+(\w+)") + summary_re =3D re.compile(r"Total Tests Run =3D\s*(\d+), Tests Pas= sed =3D\s*(\d+), Tests Failed =3D\s*(\d+)") + + with open(bsa_kern_res, 'r', encoding=3D"utf8") as f: + for line in f: + test_match =3D test_result_re.search(line) + if test_match: + desc =3D test_match.group(1) + status =3D test_match.group(2) + self.log.info(f"Test: {desc} status: {status}") + + match =3D summary_re.search(line) + if match: + total, passed, failed =3D match.groups() + + if int(failed) > 0: + self.fail(f"{failed} tests failed ({total})") + + if __name__ =3D=3D '__main__': QemuSystemTest.main() --=20 2.47.3 From nobody Fri Apr 3 19:26:41 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774281448; cv=none; d=zohomail.com; s=zohoarc; b=bkvQVoksiTri0Ha+W07gX0x57/FaUeww9qJBKqjjzvj8ZRKWhml7HFpWnQIi6S2cRqUMntOwVfyyMTTk0fo9OUwjkOzsQhnOWa7qWN1gxD4ZYCAGmTCNtJGg1AN/guKknS1M8xv5WpQF1Jic97u4zpRRQslfpn9JlxJBP0UpRfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774281448; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=P1owwL+w+vru+csJAdWQEKd51KLa9JtH8Ji/d8a5Sfc=; b=RtIstuVw7+yA1TxWoF9fhjJ6YtBEN2Jw693Vs3ryKEAJ57UTClmn4w2cv5lnwkpeos3Viz0tLeAB5yLXbl+t29EpfGtJ/39APFItehoIgpWMycAvx+SA4+5umokh2DdzUAf9peVyMC4l3EwHg5nPG3a8WUkRL0GGaV/bVXrWxts= 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+importer=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 1774281448401408.22806581880445; Mon, 23 Mar 2026 08:57:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4heH-0005FR-9C; Mon, 23 Mar 2026 11:57:01 -0400 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 1w4he2-0005EV-2e for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:46 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w4he0-0007tN-7x for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:45 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-b97a9f4b4dcso55075766b.3 for ; Mon, 23 Mar 2026 08:56:43 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b98335de177sm510337766b.29.2026.03.23.08.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 08:56:41 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4D64C5F888; Mon, 23 Mar 2026 15:56:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774281403; x=1774886203; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P1owwL+w+vru+csJAdWQEKd51KLa9JtH8Ji/d8a5Sfc=; b=Z/8m8wNdd1k8SwowSXTptQr7tUDGdeChzZZawKP1kQgeDGipR+uyHS6TKGBuHECk3O FOwfe5dM+7/vo1BqnY22HemmFUH4TU9/rTgOMAQODYl+Tj2AW75vXZPxj/PHTC8ZGMLa Bt0ZilFqAJwIrW5Gqo9hkPsKAOkT4KNBLXGjFOp2e8eJdPrtBmCTbHLtE1JzcItQ8ens yEDSN2U5vFxb6vJAc1ueTcb9VafeIzPAHuL2/7cUC5gVaQVmn7qqi8O1dXGiQOZi/kXd /+PPAB96re45Lj6txyyewfD8CwgO2vZ3NJzrsY+7ppE0497Dz/2FCxAegw3UKpFnazCj jrtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774281403; x=1774886203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P1owwL+w+vru+csJAdWQEKd51KLa9JtH8Ji/d8a5Sfc=; b=jYFkE+AB9ujwuA73UeiKCc+qYxuHNA7LvGTXoP1z+roaG9H/zah/PQKYvsUq8/yPjE SvRVKnYbbg3SeG0E20GSr1gBgkdikQ9NePsSlbPLCJVd5ve+NKS4Ha0rLqF+EMpKK/tn urrqK4KJrpOSGV/0Yzf4aa656awRTgZ/z7zrPkU7yH4Kq+p0Ut2UQwsK/HDx/OLkWLer uiCpDwQNX0zXZkUniPstz2XQnVPQpcySs5VcXLz+nRcZMlhhCGRMDTJLIPnSyIBO73Xu 6nk6eBvQdFW8xhkYscYD+EEwo8yeY4v5nWZeLOTAWO6+xSA1ZHd7j6U4jyK3xxbuC40e Ah5g== X-Gm-Message-State: AOJu0YxSue8hUT3uq31SwyIVa/DtCE9CIYNzQZms9DIXNTzFTNfKx1Gb 0MmoHHt9Htx81FrgeCAkjSshSnBBYGktIB/vzL5RtE31Skzqvg5H0ovSHT7SbKkJ3jM= X-Gm-Gg: ATEYQzyvUgdw43yUujQOSS5PaKpe81iuq/awQHj4pWjTLEbIcmi1aIfhCvUso57607K gf/DLsW9aDA3fh2O2IhCLmdS6JpTkrdIhmJFLbdtv9vZeFOxSHxBAyFYzGM/lWSsF6+VKbovb5t 2vKVd3XOzzrcKlQxhiZN3m52Hy5mSBFQ887fsu6jS46W2VcMBYUjINBqrrH/MI5szAdvMWDEfLc 0sDskOpmvSZGMbZpW0wTg232RFtZTOpLMlPkBkFzGPvLkICswcG0noWgxcLD01PbsfRGvhozCj/ IaTpHzx8hLmDlaQSXhcV5WernY1J1APkcp2TB22/0xtsU3fAPvWp/HWg+n0q06lX/+qbQ7z0mXo bNkBGnsvnIe+fzGA4tMyU5mONkyK7PUvha8xxo5EZEaMcP8h7DJ1KrU740p81IPUo0mKITf5Ad2 kdcym78Kty4zJQ59zCoWXkAew= X-Received: by 2002:a17:907:3f98:b0:b98:4b5e:da5e with SMTP id a640c23a62f3a-b984b5efa8bmr660242966b.43.1774281402533; Mon, 23 Mar 2026 08:56:42 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 5/8] tests/lcitool: Remove python3-sqlite3 from the list of needed packages Date: Mon, 23 Mar 2026 15:56:34 +0000 Message-ID: <20260323155637.145015-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323155637.145015-1-alex.bennee@linaro.org> References: <20260323155637.145015-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774281450013154100 From: Thomas Huth According to commit 7485508341f4 ("tests/docker: Add sqlite3 module to openSUSE Leap container") that introduced this line, the sqlite3 package was only required for Avocado. We don't use Avocado in QEMU anymore since a while, so we can drop this package now from our list again. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Message-ID: <20260316135407.209072-2-thuth@redhat.com> Message-ID: <20260320155107.2143191-6-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index 5e34e953514..b78a1d7f2e0 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -101,7 +101,6 @@ packages: - python3-setuptools - python3-sphinx - python3-sphinx-rtd-theme - - python3-sqlite3 - python3-tomli - python3-venv - python3-wheel --=20 2.47.3 From nobody Fri Apr 3 19:26:41 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774281482; cv=none; d=zohomail.com; s=zohoarc; b=oAEvU7ZO4InbRtZbwY33W2i2ItXD821+TZnftU+XUh8i00+tQCsjBFVEwvSjmrW/xQwx8j07K3+sV1V2fTFc5gUMGb6+qENdy4/oY0lI02WrjtKz+tPFUkDy3SAFNYyyHzQ4TeuOccH07xFiCrJJCnKiiywE3Q+PGfiC/T6DVpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774281482; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vjPZC73viIsdKu1CaxgQ6rVZFRaPF///HYQPK4UbREA=; b=IsasqAGoCHn5d2G/lPh1wfaZKcCtQ3oHAyxOgnLYe8/hxfCA70uO3pNLduzpARgeZy/nEOcfCP+Z9ABhrW7gVdei38Tf7Y2f+ycr2Vmrvu1wC03qktYj0JOosoFeZLf7R0BPK983UUT7waFbhZxtCIiz3HMSk6cIuiGQcuNbM6I= 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+importer=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 1774281482906415.63786486544575; Mon, 23 Mar 2026 08:58:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4hen-0005b7-Kk; Mon, 23 Mar 2026 11:57:33 -0400 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 1w4he4-0005Eo-9n for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:50 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w4he1-0007tX-DR for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:48 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-b9841aecf72so335806866b.2 for ; Mon, 23 Mar 2026 08:56:45 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9832f8dff5sm509273466b.24.2026.03.23.08.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 08:56:41 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6297D5F8D9; Mon, 23 Mar 2026 15:56:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774281404; x=1774886204; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vjPZC73viIsdKu1CaxgQ6rVZFRaPF///HYQPK4UbREA=; b=e7imMg2PsWq/sSAQW5nI3B5oqhFkVMOjBUb+FrVdP+HlRjkDrBhPd3ncSGDESw7Q0D rrKRUD1LkSbaMDkVESl33v7spdpGdKUXJ9nfuC0vTltIj/gomgGqjEatr5HWtkNTDsC4 C/o9dYNn0Ox+WpAC2vjb4eifYzlwAc27rHi309XqxMt7zJFz4bzoEqWOuQVc/mZqBdCY BAB8ikua3NA5D+ViFQiiLTD4seyxOknCOctONyaOqD94Nicx+aXQSudN/Y+lWCGJREzG 4PTtkVKTfWO1kYNpstPepnvx/utZDnhu1KK2gAcrEvj6yqxIhqrIwdmBwsc4SnUPvxj2 S+jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774281404; x=1774886204; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vjPZC73viIsdKu1CaxgQ6rVZFRaPF///HYQPK4UbREA=; b=qLUoKHgu/frSxuo6/KcRaQIXU40iZOHp3kBKV8LFEri34/67EsmvoBr3M3dyVExSOd tdUdgYUPvmUCEYWpRBdvJ64pmCp/cBEMMfwMGel++/nvA+R6AqBlI2Mr6SfwnMj1lpOY rk93VYzAPCLdheZa9mn9KH4YtaikcIShCy7ENsK1jDJ4lWPYqs2ppMfBjrinc6eu4Ugu DHVepPCks3VWfJdlw9h8HVljkDBTrPdNO9zb8rjbMsglisjNbWzWCrbY1SSj1aIjB/Go xgO92RQ0F5XlkFqvnPpNr6zSt1U6TS7EoyodgGPGWJcIX73gJPT7ZA1inIrCoQjmqfl8 V84Q== X-Gm-Message-State: AOJu0YxFXdkMoVCiTRcZLUEZLnoLvExk92u+2OWgWry8HbYDlzEz4fQv AM9Bnlo6Xea6hsWO9mVXG5kHR5D8sA5F/MTX+VMa1vLbYc8EK2TlUU9hpDyAOLVHDg4= X-Gm-Gg: ATEYQzyfxcSNQyaoWf6cAhQAfc+vGOQWqQTRtIEpXGqO7XrGbkKvWZj1Dvxl0oXPHZt 2eevM/yJ7t7gV8gkDNHeA0Xv2pJuLLzh3QJ5Dc8USZkjpWWk1vDRvbd8jbCdCQ84d4jJKyTpXul uuC/dpyiw+/XyZBYOUSmqUYCU9ZQ3dEJ/d1ttcCF2XOR609vSuSJHRS5smXk0/44Tw2qpX5iNtk hbb/r6rItsIq1ljVSPTvqgQDV3e90vT5CxFmys/SUSDzB2aqdAQRrT037fzpPtHMckM/0VeQZNU +NaY5Bbd78M/6jzs+5owAZDPlQAaoFFf+2nQJPsHLtC9jka1ZRPzfbzoPFMADY3eafjgPFa0bTy kAnAAgBHzmjA/itAN6P6Ll6yIfmr4kzFJ6w1JwXw9noBW5pi2wmlwno5I4zQVk4KK+snqVhK/4N dw38+hrBhdAvD/tTfiCkWBXjM= X-Received: by 2002:a17:907:394:b0:b97:7157:e1d8 with SMTP id a640c23a62f3a-b982f362ce4mr676821866b.31.1774281403930; Mon, 23 Mar 2026 08:56:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 6/8] tests/lcitool: Update openSUSE to version 16 Date: Mon, 23 Mar 2026 15:56:35 +0000 Message-ID: <20260323155637.145015-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323155637.145015-1-alex.bennee@linaro.org> References: <20260323155637.145015-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774281484972158501 From: Thomas Huth The first version of openSUSE 15 has been released in 2018, and according to our support policy, we "support the most recent major version at all times for up to five years after its initial release." Since openSUSE 16 has been released a while ago, and openSUSE is clearly older than 5 years already, it's time to update to version 16 now. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Message-ID: <20260316135407.209072-3-thuth@redhat.com> Message-ID: <20260320155107.2143191-7-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/configure b/configure index 42c45fe47a0..eea90306728 100755 --- a/configure +++ b/configure @@ -927,7 +927,6 @@ if ! check_py_version "$python"; then error_exit "Cannot use '$python', Python >=3D 3.9 is required." \ "Use --python=3D/path/to/python to specify a supported Python= ." \ "Maybe try:" \ - " openSUSE Leap 15.3+: zypper install python39" \ " CentOS: dnf install python3.12" fi =20 diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 60618971584..62fe60d047f 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -3,70 +3,17 @@ mappings: bindgen: Ubuntu2204: =20 - flake8: - OpenSUSELeap15: - meson: - OpenSUSELeap15: # Use Meson from PyPI wherever Rust is enabled Debian: Fedora: Ubuntu: =20 - python3: - OpenSUSELeap15: python311-base - - python3-PyYAML: - OpenSUSELeap15: - - python3-devel: - OpenSUSELeap15: python311-devel - - python3-docutils: - OpenSUSELeap15: - - python3-numpy: - OpenSUSELeap15: - - python3-opencv: - OpenSUSELeap15: - - python3-pillow: - OpenSUSELeap15: - - python3-pip: - OpenSUSELeap15: python311-pip - - python3-pillow: - OpenSUSELeap15: - - python3-selinux: - OpenSUSELeap15: - - python3-setuptools: - OpenSUSELeap15: python311-setuptools - - python3-sphinx: - OpenSUSELeap15: - - python3-sphinx-rtd-theme: - OpenSUSELeap15: - - python3-sqlite3: - OpenSUSELeap15: python311 - python3-tomli: # test using tomllib apk: Fedora: Debian12: - OpenSUSELeap15: - - python3-venv: - OpenSUSELeap15: python311-base - - python3-wheel: - OpenSUSELeap15: python311-wheel =20 rust: Debian12: rustc-web @@ -79,12 +26,7 @@ pypi_mappings: default: meson=3D=3D1.8.1 =20 # Drop packages that need devel headers - python3-numpy: - OpenSUSELeap15: - - # see above python3-tomli: apk: Fedora: Debian12: - OpenSUSELeap15: diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 79a280feab4..e4d01d792b7 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -226,7 +226,7 @@ try: generate_dockerfile("debian", "debian-13", trailer=3D"".join(debian13_extras)) generate_dockerfile("fedora", "fedora-43") - generate_dockerfile("opensuse-leap", "opensuse-leap-15") + generate_dockerfile("opensuse-leap", "opensuse-leap-16") generate_dockerfile("ubuntu2204", "ubuntu-2204", trailer=3D"".join(ubuntu2204_rust_extras), # https://bugs.launchpad.net/ubuntu/+source/rustc-= 1.83/+bug/2120318 --=20 2.47.3 From nobody Fri Apr 3 19:26:41 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774281486; cv=none; d=zohomail.com; s=zohoarc; b=U4YpLrDJr8dfpvHoa8zvqo2uzgYw5eB1kN2D/yAESMPnhK5L9LLnViAZFvQPbAFGPztw6tQ/SMD2Iq8XSb8NZna+9b/w1cuohgEg7YdHRXXBPUlEQ6XWdvwnJ049VKpp3AWKvdVYT4M18x6PPCQ+kUoq1Gc4TKajw4JZcnIHqJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774281486; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=43Q6+kzhBrTb5bx6FeAKwYn/Gs9dWMYzJ9+hPGcPf+k=; b=Mr896bUkCp1WW8nITNzT0seIsWmk8atdBre3gaXsXm7hur1tvvKHdfr8p2rusYw6s/Yf4c0uVCoKLmsihCz2V2XQ7I1lhrO5NECdcZhlZpxseS5vjVYQYaQeM3j+91tgKNX4JV0v05EGNuYbr+7rArRIKYQncMjuq0v5eTo1f/w= 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+importer=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 1774281486018214.26914987222256; Mon, 23 Mar 2026 08:58:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4heo-0005di-OV; Mon, 23 Mar 2026 11:57:34 -0400 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 1w4he5-0005Es-7P for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:50 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w4he2-0007tl-VG for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:48 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-661d20c9787so467129a12.0 for ; Mon, 23 Mar 2026 08:56:46 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-668cf4f89fesm3900200a12.4.2026.03.23.08.56.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 08:56:41 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 75FAF5F8EB; Mon, 23 Mar 2026 15:56:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774281405; x=1774886205; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=43Q6+kzhBrTb5bx6FeAKwYn/Gs9dWMYzJ9+hPGcPf+k=; b=K2NyxfBzi0wY3aPY4aLa+zdeC+uNeRgI/RjHqoiyZG6OH7VAmSCqptXfZQ5Zz0h7JK RfuMHSmXQWgvLy3FX92ioYvWJ0qCWGd/hjgWZJmL7H8IUE7yuwnH/euOT32d4tXT0v2R aufc8wBYMqMKECgjL/Ft2vGNfjeXT3J8i69/nZ+oyAJzdSZAKFemFHV8gF4b57T3M6dq rwn2yBSvzAH96hjme09R5w45OziOFQvNyLrMsIy9kJzCSFna4zMKCl1H690w71wCbfVM WA96C/Nr4I1O3OqCuGlTqa1g/JgROAqpNSOepBMQkoTz0UdOuwBcr2Ur2uEym58IMLm2 G84g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774281405; x=1774886205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=43Q6+kzhBrTb5bx6FeAKwYn/Gs9dWMYzJ9+hPGcPf+k=; b=IKnClX77Zp5sRh5t1VXVlECrD/eISdamz5LngWZlqC2OjE7DVTMm+3TgeMDCGqODUG 7tqY2XedLF63haIT0uJEXIq9UtRJdlK8kWBtFIqFnNLJNYD16nhSpx8VO0/9xpqGHl63 PtXu+z+fyCPNtCiFc69jhOdkEIqY6msN1ma2T4oM92y53Y+HUlTru6kIODo1ydYaIH+x 1yTsTN/BqCE3tM+fmbvBmkLNnF90TJCfRERYEqXfDCGYuqasCalajCHodTXHRob9ZNeF /KyX9PRKQlE8V8smzOW9GGrLEH0aKSzCLkrNOHk8zAoZaJmFC7ywF3KALzjmqUYo9x7e dR7Q== X-Gm-Message-State: AOJu0YyKhYSxjq0WaLSNuc+xbf/BwIv9bfwweFyde2gZgVrXOzKz/M6z GVN5YMVYfA3Op/64PNfmqVFCrbt2CT8h8JuXSchJPvsLsY0cCASR3Fco7oZWq3lZGYU= X-Gm-Gg: ATEYQzxamvkcA7yVZ6xpUaC503PyB+rLaEe1IYKwoO2Lfvk6Ytz68Z7UrU/9Tx0esW7 V8jur3c6LMMWo+hu/SKiwlqUZppti+CoiMhOy8usITLetNP1kw+CNOTDYoaM8VXtaHMrb9VuPTC K1gcZziDBmk6yaqdpVpvfQB8xX0OoWgr71Qn/d56Fg4GA7l/jR3prBjxV9mhKRdRbw/snfTTxnD 9k1s/cKxGh+Z5O1S+bSc3CXGIPAMM5ofp5Pi/ZHG9BUDQoeJ3Tl5BX3k+61Rks5FTXDcPBXWdQH 9rEFQvv2EcIxe49zmpIj6H1d0XtVBMFW+9ffyYR/GcyV1+rn6kZi4kE71pFsoYeqCdNB8C0vfR5 Xe+4SYgm2S6gJRPg6QplLtlnWpnFv+frui2jPcaduMu+vQkz5phuFNP6pdrvUeQUs/inaqkMByz Zhf3oxgD+OzDFwLefcOqeEPhddxz3NFInjRA== X-Received: by 2002:a05:6402:158d:b0:668:502d:80b6 with SMTP id 4fb4d7f45d1cf-668c9928d2emr8305443a12.26.1774281405205; Mon, 23 Mar 2026 08:56:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 7/8] tests/docker: Update the opensuse-leap container file to version 16 Date: Mon, 23 Mar 2026 15:56:36 +0000 Message-ID: <20260323155637.145015-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323155637.145015-1-alex.bennee@linaro.org> References: <20260323155637.145015-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774281486893158500 From: Thomas Huth Run "make lcitool-refresh" to update the container file to the latest version of openSUSE. Signed-off-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Message-ID: <20260316135407.209072-4-thuth@redhat.com> Message-ID: <20260320155107.2143191-8-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index d693f2c6f85..66e90fa3634 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,13 +1,12 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all opensuse-leap-15 qemu +# $ lcitool dockerfile --layers all opensuse-leap-16 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM registry.opensuse.org/opensuse/leap:15.6 +FROM registry.opensuse.org/opensuse/leap:16.0 =20 RUN zypper update -y && \ - zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/back= ports/openSUSE:Backports:SLE-15-SP6:Update.repo && \ zypper install -y \ Mesa-devel \ alsa-lib-devel \ @@ -80,13 +79,14 @@ RUN zypper update -y && \ libudev-devel \ liburing-devel \ libusb-1_0-devel \ + libxdp-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ lzo-devel \ make \ + meson \ mtools \ - ncat \ ncurses-devel \ ninja \ openssh \ @@ -94,11 +94,17 @@ RUN zypper update -y && \ pcre2-devel-static \ pipewire-devel \ pkgconfig \ - python311 \ - python311-base \ - python311-pip \ - python311-setuptools \ - python311-wheel \ + python3-Pillow \ + python3-PyYAML \ + python3-Sphinx \ + python3-base \ + python3-numpy \ + python3-opencv \ + python3-pip \ + python3-setuptools \ + python3-sphinx_rtd_theme \ + python3-tomli \ + python3-wheel \ rdma-core-devel \ rust \ rust-bindgen \ @@ -110,7 +116,7 @@ RUN zypper update -y && \ spice-protocol-devel \ swtpm \ systemd-devel \ - systemtap-sdt-devel \ + systemtap-dtrace \ tar \ tesseract-ocr \ tesseract-ocr-traineddata-english \ @@ -133,18 +139,11 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN /usr/bin/pip3.11 install \ - PyYAML \ - meson=3D=3D1.8.1 \ - pillow \ - sphinx \ - sphinx-rtd-theme - ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" ENV LANG=3D"en_US.UTF-8" ENV MAKE=3D"/usr/bin/make" ENV NINJA=3D"/usr/bin/ninja" -ENV PYTHON=3D"/usr/bin/python3.11" +ENV PYTHON=3D"/usr/bin/python3" # As a final step configure the user (if env is defined) ARG USER ARG UID --=20 2.47.3 From nobody Fri Apr 3 19:26:41 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774281467; cv=none; d=zohomail.com; s=zohoarc; b=gdwhgIjLISo0MZxOaa32XzqP180GvuEE2mrxKXXsfPVHK1pfMBzj5bnmn76uH5i3Izp6xCuiuJMN09ekupef16kGqXnlNTIN7/FtUeJBB38W4MNS5y4/tIvqddCPkoOOsAN6FgzHlA7QKe8CmTinMWdfQHw+3wqo+E8Jeo4+Abs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774281467; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=W1oma/2M52OpMZuRml+itk1LXlVo2CNGKYp1jWRb5jw=; b=X6UIukTNSZGY/VhNNnLKFuuLjgjjVNtV9feQKH4KH5fXC8s+4Jn7ypLV9HQShiOjeeT8L1EakFKfSjc55IyTO8MgGwUUffrK7aGe087Vr6U6MdeyA8ob3YatfFM3GtnBYDsVO697tdk/KaxxSn5TPjwrCfZ3/nk/3WYOTGOHceQ= 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+importer=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 1774281467354459.63043286654363; Mon, 23 Mar 2026 08:57:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4heb-0005PP-PH; Mon, 23 Mar 2026 11:57:24 -0400 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 1w4he5-0005Et-7s for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:50 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w4he2-0007tg-F7 for qemu-devel@nongnu.org; Mon, 23 Mar 2026 11:56:48 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-b97c44417ffso308065766b.2 for ; Mon, 23 Mar 2026 08:56:46 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b98335ddfb9sm506680166b.37.2026.03.23.08.56.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 08:56:41 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A2F055F8ED; Mon, 23 Mar 2026 15:56:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774281405; x=1774886205; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W1oma/2M52OpMZuRml+itk1LXlVo2CNGKYp1jWRb5jw=; b=HcIysI8jiuucHbzkuHubu/M40fZN1Uro4L9mUTJ6j0L8UW8cwqN8SezgxAh+wHwmJh MnyXh5JRNk71hxkL+YhJckABcIrAdhhpwSm2EJlH3YNbsQS9JzffN+Tl7lztZp3NpHYP xiMLJ68p5+Fb4b58awbzFf6xsYndGHRNjsYfxtvmPY7rwU/PBdYVfiUgg570wCxoTz2+ FzbLIdwHLsnA9XYXpVH2tKa/Qj7jkjlf5LC77CkItR9HpQPJIQggoB+Gtblk8pxAXrGW ogH5HXV/lm2RtixvHtrSDKTod0ZKxWKhd6kDws4HmJiBvDg28x94V/YBB/p3YduV8Bto 8aiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774281405; x=1774886205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=W1oma/2M52OpMZuRml+itk1LXlVo2CNGKYp1jWRb5jw=; b=kcSQ7CxBMrWYNwvGQ0435MbbO6dOnZOX9SC/1CwF6Et6SKfwXXAWA7GN0sCkjsSz1q ZEwKFuOMvpi3kaXxsPD/4ATHDHHjXkX1rwhGAt8Y7nwMgtft/4LwGBZITr2q7S8+QY3/ AfiGBDbpTjb6/T5eENjQ0Bpo3FMvPO9mtet/aZWHd9F8hazU23WkSYfZNOf1wlBA9kqM lcH6kljaFQvo5/iWn9UyTwhneI+PsbMYPz7eCSIDvsb1G0efA8XoR2+vlzjLYpuuZMNF uJ/qKLbnHUtcjXiqfgpXMJNGNsY7tQ3hFOu5Juy6xZo1qGt2gvmOWhANz9Go2DoHwQb0 D6EQ== X-Gm-Message-State: AOJu0Ywgh3DF2iaDWx7Pv3uFdtYQXOlDzDrjgWKN4jxi2Dc5rgzDFcoQ GutCjGVmsFihj9hc8/PyChWQW9sdTj6U6qbDr21w2z40g2GkT1leiD8RPFVRZJF42p8= X-Gm-Gg: ATEYQzyIMoCm03iPWFuaKVIdQfzEH3OvL5q6sxH+zkS0rYK/hh+MOHba1ZAoyENiph/ 0SkyqTczQ/pQhlhnQW/iOOC2DV5vJQADtUuNJ0Imw/vfxbhELCC3cjaU1n+AU+aZHAqsUzAfjp4 WIEvWSkqE8GNttEfd/b8MJ2nP1wwCXYeeNgj17x8OywdgExEPP0i2bsdCzZOKFDpdESPFPQWlrC PCpRpqgpA+EeJOsYffqMS6GMOU0T5SNetaZ5EToxLwjuuGF41SlwppXBYW7wRL86L8+QIDQfJ0x seOMUVuyLIOP5hYwT60orx/e4YD2WYDxDOA/mE+hB5OWx6/GPZFknP2vLZkwf95Hymk5mlaR/7R 859X0hLjhvUK097IR6pD2y/NIUImXBlqHgAOi79WkxEpe1cLhvfXTzjN4zQSkYXKImIkonDke/M KTDyyD4QZlC4nFyAI72pX/cFQ= X-Received: by 2002:a17:907:9407:b0:b98:6c41:a758 with SMTP id a640c23a62f3a-b986c41b5c2mr303922266b.19.1774281404593; Mon, 23 Mar 2026 08:56:44 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fabiano Rosas Subject: [PULL 8/8] tests: Replace ncat with socat in migration test and drop ncat from containers Date: Mon, 23 Mar 2026 15:56:37 +0000 Message-ID: <20260323155637.145015-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260323155637.145015-1-alex.bennee@linaro.org> References: <20260323155637.145015-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774281469125158500 From: Thomas Huth nmap / ncat has a somewhat problematic license (e.g. saying claiming that derived work is also considered for software that "is designed specifically to execute Covered Software and parse the results", e.g. by executing ncat from your own program, you might already fall into this category) - so for example in openSUSE 16, you can only find it in the "non-OSS" repository. We are currently only using it in the migration functional test, and that likely does not fall into this "derived work" category yet (since it is also doing some other stuff), but still, to be safe, we should move away from using it now. Unfortunately, switching to one of the other flavors of netcat is also not a real option (see commit f700abbbeb6ab68a3446d1fb168a934d), but socat should be a solid replacement here instead. To avoid that someone else easily uses ncat again, let's also remove it from our container files now. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth Acked-by: Peter Xu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260316183016.239526-1-thuth@redhat.com> Message-ID: <20260320155107.2143191-9-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/scripts/ci/setup/debian/debian-13-ppc64le.yaml b/scripts/ci/se= tup/debian/debian-13-ppc64le.yaml index 25d96cea460..b16d6d58f8e 100644 --- a/scripts/ci/setup/debian/debian-13-ppc64le.yaml +++ b/scripts/ci/setup/debian/debian-13-ppc64le.yaml @@ -101,7 +101,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml b/scripts/ci/= setup/ubuntu/ubuntu-2404-aarch64.yaml index 6a72eabca9e..b58fcda0fa3 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml @@ -102,7 +102,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml b/scripts/ci/se= tup/ubuntu/ubuntu-2404-s390x.yaml index 6001da12504..fa439db4ca1 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml @@ -100,7 +100,6 @@ packages: - make - mtools - multipath-tools - - ncat - nettle-dev - ninja-build - openssh-client diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index c0303feb48a..a7ee85fcda7 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -76,7 +76,6 @@ RUN apk update && \ ndctl-dev \ net-tools \ nettle-dev \ - nmap-ncat \ numactl-dev \ openssh-client \ pcre2-dev \ diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerf= iles/centos9.docker index 6b1aa6dc0de..41a1225856e 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -87,7 +87,6 @@ RUN dnf --quiet distro-sync -y && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index c386b658b04..6fad808e1b6 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index 9d83ab7a32e..889d8a1a755 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index c2077ec7a2c..988c87075f6 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker index db9f04ee93d..d720ebb0bca 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 7758afd80aa..90a2ef15574 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index cba7f43870f..b7e36b3d974 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 24f946d1441..a70fbee0c1d 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/d= ocker/dockerfiles/debian-riscv64-cross.docker index f476cf65eaa..9ada5ecce0d 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index a60b4ab01d1..a1de94ff9aa 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -37,7 +37,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ locales \ make \ mtools \ - ncat \ ninja-build \ openssh-client \ pkgconf \ diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfi= les/debian.docker index 6c6ab0256ea..c34923b253d 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -109,7 +109,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ make \ mtools \ multipath-tools \ - ncat \ nettle-dev \ ninja-build \ openssh-client \ diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/do= cker/dockerfiles/fedora-rust-nightly.docker index 38381ef8f59..8766f952ac8 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -96,7 +96,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 818485c4ba2..751789e849b 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -42,7 +42,6 @@ exec "$@"\n' > /usr/bin/nosync && \ make \ mtools \ ninja-build \ - nmap-ncat \ openssh-clients \ python3 \ python3-PyYAML \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 32aaf01aff4..ec787aa7027 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -96,7 +96,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ncurses-devel \ nettle-devel \ ninja-build \ - nmap-ncat \ numactl-devel \ openssh-clients \ pam-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dock= erfiles/ubuntu2204.docker index 44e763f571a..fb5b03e7a1b 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -107,7 +107,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ make \ mtools \ multipath-tools \ - ncat \ nettle-dev \ ninja-build \ openssh-client \ diff --git a/tests/functional/migration.py b/tests/functional/migration.py index e995328e833..2395119d6c6 100644 --- a/tests/functional/migration.py +++ b/tests/functional/migration.py @@ -84,6 +84,6 @@ def migration_with_exec(self): self.skipTest('ncat is not available') with Ports() as ports: free_port =3D self._get_free_port(ports) - dst_uri =3D 'exec:ncat -l localhost %u' % free_port - src_uri =3D 'exec:ncat localhost %u' % free_port + dst_uri =3D 'exec:socat TCP-LISTEN:%u -' % free_port + src_uri =3D 'exec:socat - TCP:localhost:%u' % free_port self.migrate(dst_uri, src_uri) diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index b78a1d7f2e0..131d9c4ec81 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -83,7 +83,6 @@ packages: - meson - mtools - ncursesw - - netcat - nettle - ninja - nsis --=20 2.47.3