From nobody Tue Feb 10 05:41:15 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654595629; cv=none; d=zohomail.com; s=zohoarc; b=Zk7DzQA0YbwsSCYqXsXW3sVbfP4CDXhdrtK9/syyWWHfMi1eM1WtnXjt+SSbeGaonU0LMjlESGQksFtT24akLB6E6hXMmNKwevQMEMYUlih9Xpx0Su2qibmwrefQ+il/SRpJWX4yCxFFEUYC1W3jyRUWM32PDhyfXqerFQScAWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654595629; h=Content-Type: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=Q2LoqMCM/ZwdCe5KGPIkrHcczM4rhqTUZVWHnA+3UtE=; b=XwUxXh1kN0n2Hk+l2C0mvnvlZkZ0Ub6rxeubdBhDtz0wUiVD2NiLcjXgef8tNmD0l7FY2rZEX2gkTZp+g0TgyQsKzmJlVhqg0pm8YskIZH8iriozYdKTCYNJJsWKEVDTK/sA25QaKel59oXM6u/fgjZ/t7INd45WcSH43Uce01k= 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 1654595629065871.9727114344408; Tue, 7 Jun 2022 02:53:49 -0700 (PDT) Received: from localhost ([::1]:52096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyVuF-0005UG-SC for importer@patchew.org; Tue, 07 Jun 2022 05:53:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhg-0007sQ-Gn for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58516) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhe-0008P6-Sm for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:48 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-528-Y4iGGGIsOkCOXYRDpppFfw-1; Tue, 07 Jun 2022 05:40:45 -0400 Received: by mail-wm1-f70.google.com with SMTP id p24-20020a05600c1d9800b0039c51c2da19so1513792wms.0 for ; Tue, 07 Jun 2022 02:40:45 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id n16-20020a1c7210000000b0039c4d9737f3sm6424724wmc.34.2022.06.07.02.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654594846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q2LoqMCM/ZwdCe5KGPIkrHcczM4rhqTUZVWHnA+3UtE=; b=J8ulHi59WzYpbiedZUrurNSpp5WqpEnG1kL9/87OLC1oIHXsf9uWMiZSnm14M43DhCsv5y vr8N2R59Fg2CeuGnbI+Q6mnw8K0pdPJYkLflH6j/sS7UbHTJqPkOBfjrYi08pchbYHbEuw G6jatiisTUbCcnl6xzgh64V3I44TjwA= X-MC-Unique: Y4iGGGIsOkCOXYRDpppFfw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q2LoqMCM/ZwdCe5KGPIkrHcczM4rhqTUZVWHnA+3UtE=; b=QWXLbaNBeLAQF7W+6KS+Y205pDEyDsJ7wYKLs9nSU6l5WGMT+udrEPrQ3hpLXo8kcm SkS6Frb1ahmi8gx77mRC7lSwU5s6mBngN4HeodoIo9z5KsZ60iZZLAEmKSXjRla7b95D 58mTWBvQHIr9GtY+jJFxWVcskzUdu6Y1Gv9PgHUe7zbZ4qiZAM9ZSk6gZjWJdHwyzXJT LIR3o+q75AldKAlTNvfNjRGhQYWwAJFuc7q6qIAYdfX49A1XmKVQZItzYD7MqoYQJg0j JPeG46/6iBQGeYHnXL/X008QH44ZUD4SkWuPJriCjpWORltSyVxPjf/d+bIuBJTmBQUu SIHg== X-Gm-Message-State: AOAM531Bywa9bgr0vFNEzG+2cXnecNQZZ0QmzcnwUfw4pdhwBB6Y8WH4 NX48pujBI4Qyxfjz+S/++X8TAN/rzT90hzCajtFq2y5y+fiFpatLZFr8LrbOlt+hiOOLhAZX/6R 7mNd4YN1XpSIT47+8wVnvkbIAm3Qwq4OHiTU7lC+xWm00PZYqAWOUt6x0gRZFDvCP0tM= X-Received: by 2002:a05:600c:2194:b0:39c:419c:1a24 with SMTP id e20-20020a05600c219400b0039c419c1a24mr20409469wme.186.1654594843636; Tue, 07 Jun 2022 02:40:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmW1KOPjYWoJBAinRQfiFsEpWn2WzzNeIqMD+Bnh4KV+48WCOSum39p/Nf8qB47TstFAGZFA== X-Received: by 2002:a05:600c:2194:b0:39c:419c:1a24 with SMTP id e20-20020a05600c219400b0039c419c1a24mr20409434wme.186.1654594843129; Tue, 07 Jun 2022 02:40:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 5/7] configure: store container engine in config-host.mak Date: Tue, 7 Jun 2022 11:40:29 +0200 Message-Id: <20220607094031.1227714-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607094031.1227714-1-pbonzini@redhat.com> References: <20220607094031.1227714-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654595630569100003 Content-Type: text/plain; charset="utf-8" In preparation for removing $(DOCKER_SCRIPT) from the tests/tcg configurati= on files, have Make use the same container engine that had been probed at configure time. Signed-off-by: Paolo Bonzini --- configure | 11 ++++++++--- tests/docker/Makefile.include | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 6b38b0815c..0fd5a3cfad 100755 --- a/configure +++ b/configure @@ -1819,9 +1819,11 @@ esac =20 container=3D"no" if test $use_containers =3D "yes"; then - if has "docker" || has "podman"; then - container=3D$($python $source_path/tests/docker/docker.py probe) - fi + case $($python $source_path/tests/docker/docker.py probe) in + *docker) container=3Ddocker ;; + podman) container=3Dpodman ;; + no) container=3Dno ;; + esac fi =20 # cross compilers defaults, can be overridden with --cross-cc-ARCH @@ -2401,6 +2403,9 @@ if test -n "$gdb_bin"; then fi fi =20 +if test "$container" !=3D no; then + echo "ENGINE=3D$container" >> $config_host_mak +fi echo "ROMS=3D$roms" >> $config_host_mak echo "MAKE=3D$make" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e68f91b853..d9b6ab7b41 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -14,7 +14,7 @@ DOCKER_DEFAULT_REGISTRY :=3D registry.gitlab.com/qemu-pro= ject/qemu endif DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTR= Y)) =20 -ENGINE :=3D auto +ENGINE ?=3D auto DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) =20 CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) --=20 2.36.1