From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164882266543866.25343903215253; Fri, 1 Apr 2022 07:17:45 -0700 (PDT) Received: from localhost ([::1]:32814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naI5w-0001rg-D9 for importer@patchew.org; Fri, 01 Apr 2022 10:17:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI1x-0003I8-V5 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:38 -0400 Received: from [2a00:1450:4864:20::630] (port=37823 helo=mail-ej1-x630.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI1v-0006aH-Ka for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:37 -0400 Received: by mail-ej1-x630.google.com with SMTP id bg10so6162505ejb.4 for ; Fri, 01 Apr 2022 07:13:35 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=px5DmONzQrE1fygF/BcA42BR1vpVp3BuBnpP9NbGVY0=; b=ZWFEh+Dm/h619aQxDhpCRlvLPblcZfCc7tIvqDGOYCAOYaOAYSPZJmWWLN38TbS7Fq 2z3ek95e6j4znbb29QhPFzGoX5jjkiJDQEhjSTb1MGGz5/ygtu2lR/rT64GeVfHHHkk1 Y7ZeGKMtVY5HRSUQWiSNtBcH4a1p4FWwoTWrI58IWcqq2fz3/vXZJiFBRbsmdaD7z1Vy OHGnWtv6Lb/zJAj3SMeykNOa3mwuo9zOV7eHE1c1pXDOXUY5b/ILGnyAUYdTo9iqiNqs 061OrlKD4f6txIpdLGxhlxHrTXbOpdBCZfuT51/JfZzAMwm1wfI4UgxvaMJzxkKLE6R8 2F0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=px5DmONzQrE1fygF/BcA42BR1vpVp3BuBnpP9NbGVY0=; b=IXAGr1Bczd1PyaN2xA6e4B4LlHqoEr0dLgPzeJa53YKb9q0ODa1fz5bDithUT4cwj0 4vtqWKEpx+ObftjtXN1mxFkvgBmbBY4gXLxgPlnH1fFP9S90hgJ6tVpo8tJIOCm3tcCx IzfzuT2dJsdP3mqzjJg0F598MkbwczO8vkQ7NQRKSsEbJt3qUYumQ8C4v8Dsuuutdt5+ ZVJ4i0+hyx7mgn0uLXXJj4XE55SUdJdR2uxAigZmcOYMRrG0Xp8SIk9oYPVeTzB9Pkb/ FshO8wso8dIppZRhcmj8MMVUDmGG8PN4Imb1yHaLVNcgjEFHbGhwXa7BuSlz9xFHa2rU fRZg== X-Gm-Message-State: AOAM533jmwv3SVFZUjVPCYHzi5FxRT5jd0qYACeraAPzMpjE9Gr332FI 7b5b4dQSuF23yvZkv01ePX7IM6BPMn8= X-Google-Smtp-Source: ABdhPJxSK2cVq1XXWtsA8k2uL2NBBZ+k3RO7zT+GkWKgF30zCNZXjN48JQ5lNjA/dMi18U4EWbssAg== X-Received: by 2002:a17:907:2ce1:b0:6df:85e4:d65d with SMTP id hz1-20020a1709072ce100b006df85e4d65dmr2955ejc.209.1648822414070; Fri, 01 Apr 2022 07:13:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 01/17] tests/docker: remove dead code for linux-user containers Date: Fri, 1 Apr 2022 16:13:10 +0200 Message-Id: <20220401141326.1244422-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::630 (failed) 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::630; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x630.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822667832100001 debian-powerpc-user-cross was the only linux-user powered cross builder and it was removed in commit 80394ccf21 ("tests/docker: remove debian-powerpc-user-cross", 2019-09-26). Remove all the infrastructure around it since it is now unused. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Message-Id: <20220328140240.40798-2-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e495b163a0..a6a5a20949 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -229,12 +229,6 @@ DOCKER_PARTIAL_IMAGES +=3D debian-tricore-cross DOCKER_PARTIAL_IMAGES +=3D debian-xtensa-cross DOCKER_PARTIAL_IMAGES +=3D fedora-cris-cross =20 -# Rules for building linux-user powered images -# -# These are slower than using native cross compiler setups but can -# work around issues with poorly working multi-arch systems and broken -# packages. - # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES) $(DOCKER_VIRTUAL_IMAGES)= ,$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ @@ -266,11 +260,6 @@ docker: @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' -ifneq ($(DOCKER_USER_IMAGES),) - @echo - @echo 'Available linux-user images (docker-binfmt-image-debian-%):' - @echo ' $(DOCKER_USER_IMAGES)' -endif @echo @echo 'Available tests:' @echo ' $(DOCKER_TESTS)' --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648822503433886.9862755369946; Fri, 1 Apr 2022 07:15:03 -0700 (PDT) Received: from localhost ([::1]:54816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naI3J-000611-OA for importer@patchew.org; Fri, 01 Apr 2022 10:15:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI1y-0003IS-Jr for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:38 -0400 Received: from [2a00:1450:4864:20::530] (port=43618 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI1w-0006aO-SQ for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:38 -0400 Received: by mail-ed1-x530.google.com with SMTP id b24so3097359edu.10 for ; Fri, 01 Apr 2022 07:13:36 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i2G5nPqy3xxJ/zW/TF6DHhTbif27drx4USQ+Ko9z2go=; b=KJMU3YFHVnUMCBeXbEXIhLMYCwFuLTFhp2e/OSz/8ldAZzlWaHBrXTewiBpAaIabAh hEUJ1BzD5WW7p2iD9tlpAwxXD7pIcdt77Gy6MthsQq0bLPf/k3PL4LPFLR7IXZgK96T6 C7VDf+FOePItWz60kTT2gzcnEFIiU8oB/Dnjfk0TTEzYTQvdrlY5BiwH+ERJsmmZMWhG 3RivN/C9rtXtoU0jtkwhgTCoI19lGtHfhk9DzroUPpW41O3hBEAmfecdXjHAIP4+h3Du 1/U0lLdoxQI05rn3jGk1NChXV3Ph1v8LnDRBZaWV5NeXCH2ISFvmVMYZmC9LWDf+Ydzx /lbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=i2G5nPqy3xxJ/zW/TF6DHhTbif27drx4USQ+Ko9z2go=; b=7rfNU8CkJ+Lh00cxwzP5YkbJH0k4Y2fsfB6EwmIjf3DoJHPjglAmkHGV/Jhyh+W062 AMABEVvHuJWnp7rPlGJHvUYqF29JICcT1atw1Zc0uH9O8LBIkxUibszbHSOL0206QZuS FjiNZl75Cza6f3IW65MtbUA8CaWUrAvJ5kGT42G/3Erg6ZdJSgwYaFJFarktMvzabD0q ULxGtZ/T8Ay4vo9I4B3IUct39Yz318Rl0DvRTs3L4yutNV3OepeUuaGqil/pPCnvWPuk ehi17DmB3Txi027SZ6u9oxhGPdvhy5PrFcZm5lxo3ucQ4I+aw0gdU1Z+HiVp9s2RMo4p 1HyA== X-Gm-Message-State: AOAM532IQ7Aefz+oFMlQAB/K20INjpLACB7J5yKw4gYBbs0/rnrw6gDq FRozBdHodZYHQfd+IljmbL8C5KpfKmU= X-Google-Smtp-Source: ABdhPJzi+lqi1PM5sObzFK1Eb91OBT4BL2Bw1ji+zgLBcTCp5Y1f6+w2HSVZ4y8cIbrWV/Y7qPTLcg== X-Received: by 2002:aa7:d74d:0:b0:418:e883:b4e1 with SMTP id a13-20020aa7d74d000000b00418e883b4e1mr21082288eds.56.1648822415213; Fri, 01 Apr 2022 07:13:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/17] tests/docker: remove test targets Date: Fri, 1 Apr 2022 16:13:11 +0200 Message-Id: <20220401141326.1244422-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) 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::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822505067100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-3-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 20 +------------------- tests/docker/dockerfiles/empty.docker | 8 -------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 tests/docker/dockerfiles/empty.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a6a5a20949..06c40a9320 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -18,7 +18,7 @@ DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 # we don't directly build virtual images (they are used to build other ima= ges) -DOCKER_VIRTUAL_IMAGES :=3D debian-bootstrap debian-toolchain empty +DOCKER_VIRTUAL_IMAGES :=3D debian-bootstrap debian-toolchain __IMAGES :=3D $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(bas= ename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_IMAGES :=3D $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__I= MAGES)) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) @@ -99,24 +99,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian= -bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 -# These are test targets -USER_TCG_TARGETS=3D$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(= TARGET_DIRS))) -EXEC_COPY_TESTS=3D$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS= )) - -$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.doc= ker - $(call quiet-command, \ - $(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< \ - $(if $V,,--quiet) --no-cache \ - --include-executable=3D$* \ - --skip-binfmt, \ - "TEST","copy $* to container") - $(call quiet-command, \ - $(DOCKER_SCRIPT) run qemu/exec-copy-test-$* \ - /$* -version > tests/docker-exec-copy-test-$*.out, \ - "TEST","check $* works in container") - -docker-exec-copy-test: $(EXEC_COPY_TESTS) - endif =20 # Enforce dependencies for composite images diff --git a/tests/docker/dockerfiles/empty.docker b/tests/docker/dockerfil= es/empty.docker deleted file mode 100644 index 9ba980f1a8..0000000000 --- a/tests/docker/dockerfiles/empty.docker +++ /dev/null @@ -1,8 +0,0 @@ -# -# Empty Dockerfile -# - -FROM scratch - -# Add everything from the context into the container -ADD . / --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164882269705325.68059647454686; Fri, 1 Apr 2022 07:18:17 -0700 (PDT) Received: from localhost ([::1]:35136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naI6R-0003P1-Tw for importer@patchew.org; Fri, 01 Apr 2022 10:18:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI1z-0003JD-79 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:39 -0400 Received: from [2a00:1450:4864:20::531] (port=42572 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI1x-0006be-MF for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:38 -0400 Received: by mail-ed1-x531.google.com with SMTP id a17so3098670edm.9 for ; Fri, 01 Apr 2022 07:13:37 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=viUKw0INt9DhWO6VgKxhhJ0hhOGAzloEnj6zxsyTXu0=; b=AswL2/k+dJYU+ySbPvC+Zjw+Mjt/zlft6IP9vQHPALcNU9HUBYhs8LF+3D/e/+iMpy If0Nj16yaey8Jf0oaHetKNLKxcCMaa6qF101WLYkx2XqzuRiByqKK1NUCiL7mbSH6ami 1cLyv+KMdyZresOccNC9ErcvAuGaTlgpbC79UGWv2T2w9kriE4JezEKhiGfMd6idUE+F VXGSdxHQSt7J+qCOeLseBUEXjN9/4mxeOqF448/u073rZkrayg3x5oGLZeZagRp5gGfp qlU/M3KbbGanadSN3kuk1NZraTSA4xXq37mumC7bPj3505G0DLQ5r5ci3yYA3qHnMNkE U8eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=viUKw0INt9DhWO6VgKxhhJ0hhOGAzloEnj6zxsyTXu0=; b=AIEG5JOHNQzrvdiF625zIIJvrKWjiuCeGlJZzk+NI5bZvXAT1vRUGR3JS/uvk0W2eQ gAbb7HsaBeOx68OO/vxS4M1tbpMJo7lFHfRpvGD68sP4ljhWFHZgDw6ARB6Wy1hqcJbL 0RuXTP9hBLjtHvUiF5uw+XxdI1015yQTBh07NT4XREPy7rdvjWAbwutr23LlMQBs3z7F TIMNOak1MlQGOtI8xBRFxLobkd83B5cDBm81Sn241zWCVQw/KsvBnscDCJbbwKcvHiDT 57UJMdYWXurfgX4+2A8C38hJUFw1uMnf4j5230hDKmN2/cT6vOAkd23W60kPcE9LnbGF BfOQ== X-Gm-Message-State: AOAM532f4ALUHr44BtjspjabkcHvalR1uHx24NzelelUHpfI83bfLEyi saxFMAuRJBhD6pGp7kNmb1fY50P5MjA= X-Google-Smtp-Source: ABdhPJyBMz8lY+YIhk9gy4CKwz5Wca1Ul9ljUfmeb/t5dUnIcQb3RBO/p+BDyYAVRvpcz0lWC52SEg== X-Received: by 2002:a50:cd8d:0:b0:416:63d7:9326 with SMTP id p13-20020a50cd8d000000b0041663d79326mr21025495edi.233.1648822416319; Fri, 01 Apr 2022 07:13:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/17] tests/docker: remove dead variable Date: Fri, 1 Apr 2022 16:13:12 +0200 Message-Id: <20220401141326.1244422-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::531 (failed) 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::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822698334100001 Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Message-Id: <20220328140240.40798-4-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 06c40a9320..c8d0ec3c66 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -13,7 +13,6 @@ HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) TESTS ?=3D % IMAGES ?=3D % =20 -DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648822927714132.17290606735628; Fri, 1 Apr 2022 07:22:07 -0700 (PDT) Received: from localhost ([::1]:43802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIAA-0000ok-69 for importer@patchew.org; Fri, 01 Apr 2022 10:22:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI20-0003Lf-8x for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:40 -0400 Received: from [2a00:1450:4864:20::534] (port=37830 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI1y-0006bp-Mq for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:39 -0400 Received: by mail-ed1-x534.google.com with SMTP id b15so3134580edn.4 for ; Fri, 01 Apr 2022 07:13:38 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A2X2RDaQklJGwJ5thvT2Fyw9MBaeTJVoyBtZ74o+tlk=; b=GfWQ9Vrgjcpj6nF20y2207wlKmYCm6an5eRrJzNs/d2Us2Si31c7/6y482QajPdaOD bSFi8ejkmbUIpThvrwm5vabcaWGh9Dio71HgLEQJB9RykDb/jeKpxavAF60hZ9ZUs8/x /cVj5fpoLKVo0h4XzDLWDfQQN4m112amMP7xlwk4fmx343OFxFKT/M3686FCnCoSrbNP i+/hVfd1rf48LBAt99oqc/Og62wnDufNdZ3Dl/XJ5YWeKjsmQJPs4jjUYFg8ur5bU38z CYVkZodjsvf8IdQsdhECSliTlIfH7OKnPXZYbgNvOycv3kMgJN5FoMiyA3MndPylAB0Q gocg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=A2X2RDaQklJGwJ5thvT2Fyw9MBaeTJVoyBtZ74o+tlk=; b=Gzw+1afuPFTekRhT5M7uqdSRLls5aoVj11PIPZUB5en4jaYu5eRvore0C+vmkykLW7 eZEeEN6QzzgFPSMWXLxoqQzztGezq5ZOuAFawfSbie8+seMXuPAjRi806RL25Rs4Wb9J k4seRXz9W9rdnnlUtyRaYWdmBMZ6QeytW+wqh2MpMyHquhlzFI3gJQZrPP+RHgdzL0eI rjyaujmcJe5PLmtZwf01UyN5a2hwLZDWUt4h2hYM//IWVRUhzZPooi5B+jf2LFaCkcfA UyDLRoWBNNl1Xk7zUY2IgCJKapP6U5vwwsvMHJVAENKzRrjkpoWGd1ouEqh2rPwgC++R XKyA== X-Gm-Message-State: AOAM531wvdRFrQBnWhaNsb5a/lo87JTESvQ1a9aPu2wooyhDgasmQLmQ sJxlFpnFK6hPmFnOSmiFjuN+j6zcoWk= X-Google-Smtp-Source: ABdhPJw+eXPnNFHbUuP7wYMn0j/4OaQEtqo0IPD9VpAm1AM0PxbzTDJRaKckw480ivjTxNgBC6JtFw== X-Received: by 2002:a05:6402:84b:b0:419:85:b724 with SMTP id b11-20020a056402084b00b004190085b724mr21508539edz.413.1648822417349; Fri, 01 Apr 2022 07:13:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/17] tests/docker: remove unnecessary default definitions Date: Fri, 1 Apr 2022 16:13:13 +0200 Message-Id: <20220401141326.1244422-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) 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::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822928471100001 Content-Type: text/plain; charset="utf-8" The definition of DOCKER_IMAGES and DOCKER_TESTS copes already with an empty value of $(IMAGES) and $(TESTS), no need to force them to "%" if undefined. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-5-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c8d0ec3c66..751151d7e9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -8,11 +8,6 @@ COMMA :=3D , =20 HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) =20 -# These variables can be set by the user to limit the set of docker -# images and tests to a more restricted subset -TESTS ?=3D % -IMAGES ?=3D % - DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16488228701421023.2354462542588; Fri, 1 Apr 2022 07:21:10 -0700 (PDT) Received: from localhost ([::1]:41388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naI9E-0007bs-W5 for importer@patchew.org; Fri, 01 Apr 2022 10:21:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI21-0003OP-81 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:41 -0400 Received: from [2a00:1450:4864:20::52e] (port=44961 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI1z-0006c6-E3 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:40 -0400 Received: by mail-ed1-x52e.google.com with SMTP id w25so3097910edi.11 for ; Fri, 01 Apr 2022 07:13:39 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9heYVWRJb5rbQ6FDIVgV7EaicSbC8BI4muN6RzMYHic=; b=MhEB5pG+WatGCmDapk0N0J/2GqUYgUmahLVp2pAQS3wIFhwLO5zx4h9KcSbcawUr0j MJR2az0Mrnm/nww85k/sAmyUHMBIsMdB4/OqujhZGchowu0flRYAH44EMSMVcaZHZXvy 1VGOmsP8QNOi2e52QQ8jrBly4bNr6kT/6hi2CMirW1WkFu0BK41tOI7M5e9cgZGli6/o QV0kIOc1S9DE6DMUBAMSvhYCZEG86dBGDz2eE5IzuhXP7bEoZZcNOdQtpsPbTsCE7Es8 tdT1zdoKsAKk0joRNlnirnTtjKIjrAYKpcFAHMuTcOaMy85haXNG1V8zu+UXqHrBHgjI ax3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9heYVWRJb5rbQ6FDIVgV7EaicSbC8BI4muN6RzMYHic=; b=mtpg+K/wYhKhkqkrK+MDuZK+4mSADpMEfWm7AkRvNnTBZQKYyBei4z1CCztt9ISsRu Fg0MXJ35GrG7D6sZMbxrK50w7JDWZgAijhqgjkc8GLUWL61YmoVxFQ19sfQ/DQjue3X4 bOZSEXEiLxvucVjjJI82quvnbDGWN/LIHmGvF0rYBr8kKD3kRwYVi1BgtcoggtXfYy5l vQitiJEsDr5wbeIG97LbjYoQg5DgqeVCzcq5tPK1NhaOvQzpteXmdoi0O8kbRDvnJAYg BHeWRuls4Ti9c3ul9KNDYBWznF9PvFdZSyw4uIDLwnpJpWnTaUMmTHJBI9bmjokEZnD7 X6hw== X-Gm-Message-State: AOAM531T+0mkVAobTthkwLqIOWRLrklwg6EUkF51q9kt0iQVbsvU+2oA zFc8zVW7ITiVG1vsKKBXTY3iihIhSpk= X-Google-Smtp-Source: ABdhPJyBvPcXFfQ03KlfCnxL3p6XQQ1EafbE/e09i8QiNwndHBVLsc5WBzPQZUB+OlfBSOwiehlHBw== X-Received: by 2002:a05:6402:13c7:b0:41c:870e:924b with SMTP id a7-20020a05640213c700b0041c870e924bmr879413edx.353.1648822418146; Fri, 01 Apr 2022 07:13:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 05/17] tests/docker: inline variable definitions or move close to use Date: Fri, 1 Apr 2022 16:13:14 +0200 Message-Id: <20220401141326.1244422-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) 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::52e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822871968100001 Content-Type: text/plain; charset="utf-8" Variables that are defined with ":=3D" are handled imperatively, so moving them closer to the first use ensures that all the assignments prior to the first use are taken into account. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-6-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 751151d7e9..9b4d1cf837 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -9,26 +9,12 @@ COMMA :=3D , HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) =20 DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles -# we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 -# we don't directly build virtual images (they are used to build other ima= ges) -DOCKER_VIRTUAL_IMAGES :=3D debian-bootstrap debian-toolchain -__IMAGES :=3D $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(bas= ename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) -DOCKER_IMAGES :=3D $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__I= MAGES)) -DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) -# Use a global constant ccache directory to speed up repetitive builds -DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache ifeq ($(HOST_ARCH),x86_64) DOCKER_DEFAULT_REGISTRY :=3D registry.gitlab.com/qemu-project/qemu endif DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTR= Y)) =20 -__TESTS :=3D $(notdir $(shell \ - find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) -DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS= )) - 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.$$$$) @@ -47,8 +33,6 @@ $(DOCKER_SRC_COPY): =20 docker-qemu-src: $(DOCKER_SRC_COPY) =20 -docker-image: ${DOCKER_TARGETS} - # General rule for building docker images. If we are a sub-make # invoked with SKIP_DOCKER_BUILD we still check the image is up to date # though @@ -96,6 +80,8 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-= bootstrap.docker endif =20 # Enforce dependencies for composite images +# we don't run tests on intermediate images (used as base by another image) +DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 ifeq ($(HOST_ARCH),x86_64) docker-image-debian-amd64: docker-image-debian10 DOCKER_PARTIAL_IMAGES +=3D debian-amd64-cross @@ -205,6 +191,15 @@ DOCKER_PARTIAL_IMAGES +=3D debian-tricore-cross DOCKER_PARTIAL_IMAGES +=3D debian-xtensa-cross DOCKER_PARTIAL_IMAGES +=3D fedora-cris-cross =20 +# images that are only used to build other images +DOCKER_VIRTUAL_IMAGES :=3D debian-bootstrap debian-toolchain + +__IMAGES :=3D $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(bas= ename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +DOCKER_IMAGES :=3D $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__I= MAGES)) + +__TESTS :=3D $(notdir $(shell find $(SRC_PATH)/tests/docker/ -name 'test-*= ' -type f)) +DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS= )) + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES) $(DOCKER_VIRTUAL_IMAGES)= ,$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ @@ -263,6 +258,9 @@ docker: =20 docker-help: docker =20 +# Use a global constant ccache directory to speed up repetitive builds +DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache + # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make # docker-test-foo@bar) which will do additional verification. @@ -308,5 +306,7 @@ docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/d= ocker-run-\([^@]*\)@\(.*\)/ docker-run-%: @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu/$(IMAGE) =20 +docker-image: ${DOCKER_IMAGES:%=3Ddocker-image-%} + docker-clean: $(call quiet-command, $(DOCKER_SCRIPT) clean) --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648822506532661.6417009473164; Fri, 1 Apr 2022 07:15:06 -0700 (PDT) Received: from localhost ([::1]:55138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naI3N-0006Dl-F1 for importer@patchew.org; Fri, 01 Apr 2022 10:15:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI21-0003QM-M9 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:41 -0400 Received: from [2a00:1450:4864:20::52d] (port=35777 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI20-0006cJ-74 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:41 -0400 Received: by mail-ed1-x52d.google.com with SMTP id g22so3144953edz.2 for ; Fri, 01 Apr 2022 07:13:39 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L65yp4jvbDHDdl709XmNwHvaNrD2BaCXcba2IwnsElQ=; b=G44fYg1YoNOytl1lMAYIbZRoBkTHeYbcSM1vZLAQRH1FGJRjV/4puq0AHwHPSHeEdA zsWO6LEehqmT/840yswveiSo87H/F+TNKnyL5bpYnt4TSBZ12Hh66M6akZubifyaamE+ k5G8wSI2GZGEylZEKZjYMV4qeG1WDzQuo2rInF803fbQIgAlkYugIMrarTUyKWtQ6HI0 OsSgoR6ZLDpPJa8h6VFBkbE0hwpgctmX0me+pGS3DNV6FwAB84iuzzS5efcOBcpiKk8U 9KTQSQjGr95lyil1nJtSTHuZaNgso+6JmaHHWTUajrZywPpWi6cd4BPFJR2xC9EZ5PGJ nlcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=L65yp4jvbDHDdl709XmNwHvaNrD2BaCXcba2IwnsElQ=; b=EK1CByjrcvoKFMssOgnA9rahzW8eHdKl4jq6g/k3BTk/gdvB77oxQwXrYVdGlJdfSq RAbbAGMHaZoVor5A9urFVeNB8SD9HfOiJU+3Ceu7yS11pUFOn+3aRUQCcrP6dUHmWvwj X3KlELYLe/cLOUlZwZH4aAjUxQHy3W3EMdwF7qxFwl/LWmQqaWIqzxG8I+q6nW+oUAUu P+ZGQ9vPa3tGaw3VJP9IIsKonb14RR731Ct0wvw0n3irjGQkpclaSs4Ir2RT1gfM6hrh DwdWzq8mY2jwInSgOLfV3Gftv2zjUEbaS8VWFy4bnw6myPzO9XHxQNl8J5irrkGdvsYW At0A== X-Gm-Message-State: AOAM533o6BCek7MOJuE/kN5flZPgbG9jqzqBhxPyJspJlYokXykt+raa /ig+EFCEx7io+5e1TdOs/oyACZvTmx4= X-Google-Smtp-Source: ABdhPJxIMs4TKzUGGBunNACwOP3/hxUOty0wUtL9FGF00wvvgJJuKvKzAK3Olarszs9wAXo9ZKmWHQ== X-Received: by 2002:a50:9b11:0:b0:419:a8f:580c with SMTP id o17-20020a509b11000000b004190a8f580cmr21430391edi.292.1648822418981; Fri, 01 Apr 2022 07:13:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/17] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES) Date: Fri, 1 Apr 2022 16:13:15 +0200 Message-Id: <20220401141326.1244422-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) 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=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822508854100001 Content-Type: text/plain; charset="utf-8" Now that DOCKER_IMAGES is only defined after DOCKER_VIRTUAL_IMAGES is complete, there is no need to re-filter DOCKER_IMAGES against it. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-7-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9b4d1cf837..3b5ebd5567 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -201,7 +201,7 @@ __TESTS :=3D $(notdir $(shell find $(SRC_PATH)/tests/do= cker/ -name 'test-*' -type DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS= )) =20 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES) $(DOCKER_VIRTUAL_IMAGES)= ,$(DOCKER_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164882302872610.14424789392308; Fri, 1 Apr 2022 07:23:48 -0700 (PDT) Received: from localhost ([::1]:50090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIBn-00055V-NL for importer@patchew.org; Fri, 01 Apr 2022 10:23:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI22-0003Tu-Ir for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:42 -0400 Received: from [2a00:1450:4864:20::52d] (port=42569 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI21-0006cV-2f for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:42 -0400 Received: by mail-ed1-x52d.google.com with SMTP id a17so3098853edm.9 for ; Fri, 01 Apr 2022 07:13:40 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e5AGSJdgprGKZ/4CwUnR3jujV6g/OQzrNz4HqHgggK4=; b=B4v7mJWHSxK95KDv8b6oUSMsyiUz5uqkCooHEzlV8MsacpqdxkjxjeEB490kGX5GOP gghNxUk5S3fGIBhvr+HnbVpr0T2bchQBddEW/oGkB71j2KhxxM4jnW3W/u/EneKuDD8/ 3B7RzzzovBxTzB0w50CO7n+ph6cNaqwTlbUkU9d//9PuKDN4p+5sEcSESNpIR7O6EavO iO1QIXOC/bmlZRmT7a8Ryk4HcdSheKHT3b7PJg4+515Ur51CaGrJGoLQrv+99+D7hoNG yss6NzHLzWvyM1tFUb20YJPFySkCppbNYcMldLe7Pj7N0HPAoRpcghuTxFCvikIZ2Sl8 0vlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=e5AGSJdgprGKZ/4CwUnR3jujV6g/OQzrNz4HqHgggK4=; b=Y2w84tYbCHE/8wYyQy7W1heXqLLdkRW+Lz/ylX4wHG/1S1+81WwsxTNz7iR6glPjtK xEmDFvcmL4OsOysykkZJ3ku2RLPAhlL6T2v6aXCYQG8PTM7OPDWBRCZetWL666YifAEM OjPN9mW/m28usNdRe2AP0C1j5NgMKHYYzehr0Yccou7wTUpgpzQguOBosaBXYw4gSCcj 3qv9t19GyBnC40WZzMHZVgfWSTtpvMXrFwT/dWr5xAduKAVwx3lqxHmJ759Os5KCxzdE Tn1nxFNFapEJAfbVOEGgxNbQJ2hf7w3UbOKT40r8VYAKSPIVwYDHbURe4/DFjwMUf1FS Vn4Q== X-Gm-Message-State: AOAM530L5NomVwUx/Bgd27rHSZJcsKeb27lRBz0mw0zPFb2lZm4uUu8F IfPJLT30qtXxuFsqR8YPuilVFPQNKng= X-Google-Smtp-Source: ABdhPJysX9lXPfF0WS+v82i8jAboCMk/nMabtPyQg4IUKdZRy9Kz18jMNqyFRCfVxfR4i1y1uVXdiA== X-Received: by 2002:a05:6402:2794:b0:419:2ed8:f36e with SMTP id b20-20020a056402279400b004192ed8f36emr21430626ede.44.1648822419838; Fri, 01 Apr 2022 07:13:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/17] tests/docker: simplify docker-TEST@IMAGE targets Date: Fri, 1 Apr 2022 16:13:16 +0200 Message-Id: <20220401141326.1244422-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) 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=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648823029956100001 Content-Type: text/plain; charset="utf-8" No need to go through the shell when we already have the test and images at the point where the targets are declared. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-8-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3b5ebd5567..2a187cb5a2 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -204,7 +204,7 @@ DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(_= _TESTS)), $(__TESTS)) $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ - $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ + $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=3D$t IMAG= E=3D$i) \ ) \ $(foreach t,$(DOCKER_TESTS), \ $(eval docker-all-tests: docker-$t@$i) \ @@ -263,7 +263,7 @@ DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache =20 # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make -# docker-test-foo@bar) which will do additional verification. +# docker-test-foo@bar) which will also ensure the image is up to date. # # For example: make docker-run TEST=3D"test-quick" IMAGE=3D"debian:arm64" = EXECUTABLE=3D./aarch64-linux-user/qemu-aarch64 # @@ -298,14 +298,6 @@ docker-run: docker-qemu-src $(call quiet-command, rm -r $(DOCKER_SRC_COPY), \ " CLEANUP $(DOCKER_SRC_COPY)") =20 -# Run targets: -# -# Of the form docker-TEST-FOO@IMAGE-BAR which will then be expanded into a= call to "make docker-run" -docker-run-%: CMD =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\= (.*\)/\1/') -docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)= @\(.*\)/\2/') -docker-run-%: - @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu/$(IMAGE) - docker-image: ${DOCKER_IMAGES:%=3Ddocker-image-%} =20 docker-clean: --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648822698075326.8262200253896; Fri, 1 Apr 2022 07:18:18 -0700 (PDT) Received: from localhost ([::1]:35226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naI6S-0003Sd-Qg for importer@patchew.org; Fri, 01 Apr 2022 10:18:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI23-0003Wq-Fa for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:43 -0400 Received: from [2a00:1450:4864:20::531] (port=33385 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI21-0006cn-UT for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:43 -0400 Received: by mail-ed1-x531.google.com with SMTP id r23so3183554edb.0 for ; Fri, 01 Apr 2022 07:13:41 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TGCoHf+X9Hr53C9PpVImrayZCSq2g9oom+Gz5PIhxX4=; b=GI3yjgsQLWeFvca3LywLx51U4db4s27LP7mQr1HOzalWMfUejY7jtB5DhTKlT6TLuC vOvoLf6u3Vo0O4k1enmyuryaL9y8Yitta8je+l/+dDEJEvKLU8WhRUl97zTSEYX8f6Q7 cmnKmqUGgrMfjZc774QkO9HUeNafri3EOKowuHHPDb3SWiHDXQxBotkKVWUNQ2gDJokI dHDMVfvpM17jxiD1opOkFr7BWSR0Nps43sLVu2O2VFEqkACmJ3KUjCDY/gh8xTquMXyc ScdUJISLSjR+fXtVtFhBZEwq9xwZMV/vmpQUAchbgCxd+cPcfvhPWSsiMvyjYRPHFcRQ PdPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TGCoHf+X9Hr53C9PpVImrayZCSq2g9oom+Gz5PIhxX4=; b=DvVBr+/ECYAqW6VbsLTK6HiZxb/O2loMl5C9PmcQpLWgDRMb70gZLV0AHh07kyXa84 sdQBKV3As6FYXMIHSndqjTY17yzDIN4rK44Ji9h9xSsqmWjiDdTLIPieLc1ZAPWCTHmx fzlTKX5mls5ncwqj3Apgi6Qn5PnvZob2y8NbZaLQfrmSvkSVVV35rsZm7qVUkX0X49f/ Bl6j70cjvaDCthtnkGIos4D7t+G768eTv+Orrm6+ZYd4jJ902jqMusREFp1Za1wxTH6D CMJt9VOLrC/gdGKsKBbc+Sk082yd+EiUAh8XllI7kvfiGGDM82/MSm2wYK01ZHPQYz00 HliQ== X-Gm-Message-State: AOAM531E0g5oalpnqxlSVoo6Kya1DTJtXHP8nHNKJLQHHAZsdrKpX/z6 LLo/yNSWTXccOt6TUKPFRt5w84xV5+w= X-Google-Smtp-Source: ABdhPJxsFl+n3f0x93mFdKaklzqPOrDO8H2XuBcvnIUC92F4bJL4hWuhVMlQMMScKo40gVJupEeE1A== X-Received: by 2002:a50:d90f:0:b0:418:8a5a:14b2 with SMTP id t15-20020a50d90f000000b004188a5a14b2mr21062745edj.241.1648822420622; Fri, 01 Apr 2022 07:13:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/17] tests/docker: do not duplicate rules for hexagon-cross Date: Fri, 1 Apr 2022 16:13:17 +0200 Message-Id: <20220401141326.1244422-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::531 (failed) 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::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822698349100002 Content-Type: text/plain; charset="utf-8" The commands for docker-image-debian-hexagon-cross are the same as those in debian-toolchain-run, just with a nonstandard path to build-toolchain.sh. Reuse the definition by renaming the debian-hexagon-cross.docker.d director= y. Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 26 +++---------------- .../build-toolchain.sh | 0 2 files changed, 4 insertions(+), 22 deletions(-) rename tests/docker/dockerfiles/{debian-hexagon-cross.docker.d =3D> debian= -hexagon-cross.d}/build-toolchain.sh (100%) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 2a187cb5a2..eb100c294f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -121,28 +121,6 @@ docker-image-debian11: NOUSER=3D1 # alpine has no adduser docker-image-alpine: NOUSER=3D1 =20 -# -# The build rule for hexagon-cross is special in so far for most of -# the time we don't want to build it. While dockers caching does avoid -# this most of the time sometimes we want to force the issue. -# -docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cros= s.docker - $(if $(NOCACHE), \ - $(call quiet-command, \ - $(DOCKER_SCRIPT) build -t qemu/debian-hexagon-cross -f $< \ - $(if $V,,--quiet) --no-cache \ - --registry $(DOCKER_REGISTRY) --extra-files \ - $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker.d/build-toolchain.sh, \ - "BUILD", "debian-hexagon-cross"), \ - $(call quiet-command, \ - $(DOCKER_SCRIPT) fetch $(if $V,,--quiet) \ - qemu/debian-hexagon-cross $(DOCKER_REGISTRY), \ - "FETCH", "debian-hexagon-cross") \ - $(call quiet-command, \ - $(DOCKER_SCRIPT) update $(if $V,,--quiet) \ - qemu/debian-hexagon-cross --add-current-user, \ - "PREPARE", "debian-hexagon-cross")) - debian-toolchain-run =3D \ $(if $(NOCACHE), \ $(call quiet-command, \ @@ -162,6 +140,10 @@ debian-toolchain-run =3D \ "PREPARE", $1)) debian-toolchain =3D $(call debian-toolchain-run,$(patsubst docker-image-%= ,%,$1)) =20 +docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cros= s.docker \ + $(DOCKER_FILES_DIR)/debian-hexagon-cross.d/build-toolchain.sh + $(call debian-toolchain, $@) + docker-image-debian-microblaze-cross: $(DOCKER_FILES_DIR)/debian-toolchain= .docker \ $(DOCKER_FILES_DIR)/debian-microblaze-cross.d/build-toolchain.sh $(call debian-toolchain, $@) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-t= oolchain.sh b/tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolcha= in.sh similarity index 100% rename from tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-to= olchain.sh rename to tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648822705510500.4741657671997; Fri, 1 Apr 2022 07:18:25 -0700 (PDT) Received: from localhost ([::1]:35510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naI6a-0003e6-HF for importer@patchew.org; Fri, 01 Apr 2022 10:18:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI24-0003bD-Pa for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:44 -0400 Received: from [2a00:1450:4864:20::534] (port=41965 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI22-0006d0-T3 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:44 -0400 Received: by mail-ed1-x534.google.com with SMTP id x34so3113528ede.8 for ; Fri, 01 Apr 2022 07:13:42 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=90ODrqTa0HPFamgrUO9+dLhhPkpjhaQvAYHl7V1rkzY=; b=Z3v7k78NZou8/NjsDtt7zKQe3vsX4Bvs1Utnnc7S+t3/HPgpHcFfa5NpOGyaarY+rX G1Y66MKCw7NvcOCeGF6PwIcT80d1ZvlMijoESaOwG7IzD8NDHBAyK3CbsXu9CcBP6ziL 3kbddDrInnxEn6ayJCl2MlEUl1to90Ifgvb2naSWykn0rcINjUN0U4Ll4LNgiN6/SDml 6b8imZ2lBDjW6tiMerslVV4Yspww1P/YYOTsJZxE7OrtdTSj6ltgiL0oNKhB/iGakpTQ 0b2G22TsVj5tnyh/ON64C3z6Dh/8UBGJ+EXVYAsyuQM/RlXx0u9z6b+9bTiQ84jTeWRE pLUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=90ODrqTa0HPFamgrUO9+dLhhPkpjhaQvAYHl7V1rkzY=; b=b3UnYTItHbfRNKABY/lJ+mOG/ocm7wNjtznQG7P56JLVb/bHejHesAXsQ05rTsHNsL 5ZVWWah315J8NiHd8YZiqfk7uiXGqhVEsQG7kBqDAujn1M/qklA6YuVqDk/8tDSGxXAr f5ixIPcSQh0HIQDPtTCQuvEsAQ6aWTIgh8gjkdAd2DpBwu0896pXYccu4cSDpXsOpIZT CiF7ndQvmtfkYR2eeDf+voJp1+xKs5DsEu3/r55D/IS3QABuIvakMnF5qURFgtFa52IK tLxf9rn8iYfDIVEXlzy4l0OFDpxTQRngB6cJXmFrY2ofPrlza+VGfxxt1SjhnOmTNUda ksOQ== X-Gm-Message-State: AOAM532/nZ6A6zD0QHt6Uj01RItrUiGLJv0aMGibDvaEFRvI979jffr3 aEPy6vtVGl2bLF8ovSD96Dg7N6poj7E= X-Google-Smtp-Source: ABdhPJwTpYLJpeTrmLx0u7SquB92eIPEsv2RRazxBfkiXRtTRDqIXGcVd6DzyvhpmP/PmBePp1e/Dg== X-Received: by 2002:aa7:c755:0:b0:419:2f66:e22c with SMTP id c21-20020aa7c755000000b004192f66e22cmr20616474eds.381.1648822421598; Fri, 01 Apr 2022 07:13:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/17] tests/tcg: add compiler test variables when using containers Date: Fri, 1 Apr 2022 16:13:18 +0200 Message-Id: <20220401141326.1244422-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) 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::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822706431100001 Even for container-based cross compilation use $(CROSS_CC_HAS_*) variables. This makes the TCG test makefiles oblivious of whether the compiler is invoked through a container or not. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Message-Id: <20220328140240.40798-9-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/tcg/aarch64/Makefile.softmmu-target | 2 +- tests/tcg/aarch64/Makefile.target | 10 +++++----- tests/tcg/configure.sh | 17 +++++++++++++++++ tests/tcg/i386/Makefile.target | 2 +- tests/tcg/ppc64/Makefile.target | 4 ++-- tests/tcg/ppc64le/Makefile.target | 4 ++-- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/= Makefile.softmmu-target index a7286ac295..f6fcd4829e 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -64,7 +64,7 @@ run-memory-replay: memory-replay run-memory-record =20 EXTRA_RUNS+=3Drun-memory-replay =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),) +ifneq ($(CROSS_CC_HAS_ARMV8_3),) pauth-3: CFLAGS +=3D -march=3Darmv8.3-a else pauth-3: diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index f7121cb4d8..6ad0ad49f9 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -18,7 +18,7 @@ run-fcvt: fcvt $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref) =20 # Pauth Tests -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),) +ifneq ($(CROSS_CC_HAS_ARMV8_3),) AARCH64_TESTS +=3D pauth-1 pauth-2 pauth-4 pauth-5 pauth-%: CFLAGS +=3D -march=3Darmv8.3-a run-pauth-%: QEMU_OPTS +=3D -cpu max @@ -27,7 +27,7 @@ endif =20 # BTI Tests # bti-1 tests the elf notes, so we require special compiler support. -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_BTI),) +ifneq ($(CROSS_CC_HAS_ARMV8_BTI),) AARCH64_TESTS +=3D bti-1 bti-1: CFLAGS +=3D -mbranch-protection=3Dstandard bti-1: LDFLAGS +=3D -nostdlib @@ -36,12 +36,12 @@ endif AARCH64_TESTS +=3D bti-2 =20 # MTE Tests -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_MTE),) +ifneq ($(CROSS_CC_HAS_ARMV8_MTE),) AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 mte-5 mte-6 mte-7 mte-%: CFLAGS +=3D -march=3Darmv8.5-a+memtag endif =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_SVE),) +ifneq ($(CROSS_CC_HAS_SVE),) # System Registers Tests AARCH64_TESTS +=3D sysregs sysregs: CFLAGS+=3D-march=3Darmv8.1-a+sve @@ -88,7 +88,7 @@ EXTRA_RUNS +=3D run-gdbstub-sysregs run-gdbstub-sve-ioctls endif endif =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_SVE2),) +ifneq ($(CROSS_CC_HAS_SVE2),) AARCH64_TESTS +=3D test-826 test-826: CFLAGS+=3D-march=3Darmv8.1-a+sve2 endif diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 84f928f7f8..8927a2b260 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -348,6 +348,23 @@ for target in $target_list; do echo "DOCKER_CROSS_LD_GUEST=3D$container_cross_ld" >> \ $config_target_mak fi + case $target in + aarch64-*) + echo "CROSS_CC_HAS_SVE=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_SVE2=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_3=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_BTI=3Dy" >> $config_target_= mak + echo "CROSS_CC_HAS_ARMV8_MTE=3Dy" >> $config_target_= mak + ;; + ppc*) + echo "CROSS_CC_HAS_POWER8_VECTOR=3Dy" >> $config_tar= get_mak + echo "CROSS_CC_HAS_POWER10=3Dy" >> $config_target_mak + ;; + i386-linux-user) + echo "CROSS_CC_HAS_I386_NOPIE=3Dy" >> $config_target= _mak + ;; + esac + break fi done fi diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index e1c0310be6..bd73c96d0d 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -30,7 +30,7 @@ hello-i386: LDFLAGS+=3D-nostdlib # test-386 includes a couple of additional objects that need to be # linked together, we also need a no-pie capable compiler due to the # non-pic calls into 16-bit mode -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_I386_NOPIE),) +ifneq ($(CROSS_CC_HAS_I386_NOPIE),) test-i386: CFLAGS +=3D -fno-pie =20 test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h tes= t-i386-shift.h test-i386-muldiv.h diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.tar= get index 8197c288a7..babd209573 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -5,14 +5,14 @@ VPATH +=3D $(SRC_PATH)/tests/tcg/ppc64 VPATH +=3D $(SRC_PATH)/tests/tcg/ppc64le =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER8_VECTOR),) +ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),) PPC64_TESTS=3Dbcdsub non_signalling_xscv endif $(PPC64_TESTS): CFLAGS +=3D -mpower8-vector =20 PPC64_TESTS +=3D mtfsf =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) +ifneq ($(CROSS_CC_HAS_POWER10),) PPC64_TESTS +=3D byte_reverse sha512-vector endif byte_reverse: CFLAGS +=3D -mcpu=3Dpower10 diff --git a/tests/tcg/ppc64le/Makefile.target b/tests/tcg/ppc64le/Makefile= .target index 9624bb1e9c..5b0eb5e870 100644 --- a/tests/tcg/ppc64le/Makefile.target +++ b/tests/tcg/ppc64le/Makefile.target @@ -4,12 +4,12 @@ =20 VPATH +=3D $(SRC_PATH)/tests/tcg/ppc64le =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER8_VECTOR),) +ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),) PPC64LE_TESTS=3Dbcdsub non_signalling_xscv endif $(PPC64LE_TESTS): CFLAGS +=3D -mpower8-vector =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) +ifneq ($(CROSS_CC_HAS_POWER10),) PPC64LE_TESTS +=3D byte_reverse sha512-vector endif byte_reverse: CFLAGS +=3D -mcpu=3Dpower10 --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648823190782190.19628840178643; Fri, 1 Apr 2022 07:26:30 -0700 (PDT) Received: from localhost ([::1]:58736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIEP-0002P1-MB for importer@patchew.org; Fri, 01 Apr 2022 10:26:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI25-0003df-CA for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:45 -0400 Received: from [2a00:1450:4864:20::52a] (port=36848 helo=mail-ed1-x52a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI23-0006dB-Oj for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:45 -0400 Received: by mail-ed1-x52a.google.com with SMTP id h4so3138343edr.3 for ; Fri, 01 Apr 2022 07:13:43 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=htpbnRni4wzuFT5jkH0Y5Ib5bx6mTz9ELOiSp0Rgt6s=; b=L4ztt78fFs/tia+N/UnwLx6jKdfNKlyFVOQrklxnl0a2wUTnL9Wny9En0274eka0qn 1Okk8JWtR1AuaKf9K9wpfhsR1rhM7FoFVv5VDgCqlZVI6DnC9s3WHn5gi+bqiMtp/RON A/PRJZXdEp0FLCdw+yztN+YEnx6lPFPrFrXm/6A4inhFO+YYP+aQ05YnI381eNTtixIY XSweat/AD68q/eCJVEM/MAIc42xAHfIUazUCz/Gngf6Vs+nerJGqJGN7gP3vH73Z0N95 pm/krnrrIvrUCeoI/U0jp5H942TB+Fc21hX92lVBE9X9Kh3L1G+IlY9TBUNI+dziDWoS qKbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=htpbnRni4wzuFT5jkH0Y5Ib5bx6mTz9ELOiSp0Rgt6s=; b=WKJ0XCl9SFnMB+kvhtufC5wR356M+CyKHl2eV0M/2Ed2IQ+6VqbEO9EWpHZPFYyLB7 rgE1ob2EAJU7A1peO+yr5Cn0Qh5S86LUgJ70fSfyel8utd/NoQUUsg4kVf2SPiTyfKaY 1QQK0enI7US+YbuuCXcvpPLxGUJSMMUsT//YqfUyAFwMoNR3/4bgqY4BQNwIdUjY33Xw LuvLpRNhdCPleHUbH+6y1grHwq6KzOmBzMQAWjTU2NAp1wJe2/cJbP/qjuV46RPFKcXP dJmiElvXlHYxKDgRW+BgefUI2jFWxdMcK6p29xvx6qMjvBwetofFYiRJGteneg4aGc7/ fndA== X-Gm-Message-State: AOAM5308s8xM3Gx/tLhWWq7LqK8RUfgVWy8Um0Z7288qU0+0P2bcyxl8 RT1aCRhdl1JuMVmlzLGLJLaTplNHhF0= X-Google-Smtp-Source: ABdhPJzL0u3p7GN/Dz9DkQ+lNCQ10eGqFoY8fVqRDxJrqTpMKdzLhzLv/yu7c88vUHqDMtvVqVM6oA== X-Received: by 2002:a05:6402:3586:b0:419:6059:f016 with SMTP id y6-20020a056402358600b004196059f016mr21439470edc.402.1648822422431; Fri, 01 Apr 2022 07:13:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/17] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak Date: Fri, 1 Apr 2022 16:13:19 +0200 Message-Id: <20220401141326.1244422-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52a (failed) 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::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648823191865100003 Just check the target name instead. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-10-pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- tests/tcg/configure.sh | 2 -- tests/tcg/multiarch/Makefile.target | 2 +- tests/tcg/x86_64/Makefile.target | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 8927a2b260..57026b5899 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -227,12 +227,10 @@ for target in $target_list; do case $target in *-linux-user) echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "CONFIG_LINUX_USER=3Dy" >> $config_target_mak echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak ;; *-bsd-user) echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "CONFIG_BSD_USER=3Dy" >> $config_target_mak echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak ;; *-softmmu) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Make= file.target index dec401e67f..6bba523729 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -10,7 +10,7 @@ MULTIARCH_SRC=3D$(SRC_PATH)/tests/tcg/multiarch # Set search path for all sources VPATH +=3D $(MULTIARCH_SRC) MULTIARCH_SRCS =3D $(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) -ifneq ($(CONFIG_LINUX_USER),) +ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET)) VPATH +=3D $(MULTIARCH_SRC)/linux MULTIARCH_SRCS +=3D $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c)) endif diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.t= arget index 17cf168f0a..f9fcd31caf 100644 --- a/tests/tcg/x86_64/Makefile.target +++ b/tests/tcg/x86_64/Makefile.target @@ -8,7 +8,7 @@ =20 include $(SRC_PATH)/tests/tcg/i386/Makefile.target =20 -ifneq ($(CONFIG_LINUX_USER),) +ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET)) X86_64_TESTS +=3D vsyscall TESTS=3D$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 else --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648823067664196.41439393175153; Fri, 1 Apr 2022 07:24:27 -0700 (PDT) Received: from localhost ([::1]:52380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naICQ-0006cW-LV for importer@patchew.org; Fri, 01 Apr 2022 10:24:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI26-0003gp-7L for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:46 -0400 Received: from [2a00:1450:4864:20::52b] (port=46851 helo=mail-ed1-x52b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI24-0006dN-Jt for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:45 -0400 Received: by mail-ed1-x52b.google.com with SMTP id z92so3082545ede.13 for ; Fri, 01 Apr 2022 07:13:44 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EHZZ80ALv+K7PZJdkF1ud/9uldCP93oAdPnykBe3hyM=; b=pOv4HbsOTSoeE7EfQ+mh/cBAzYh6IodARnsVN2IbBy3/RngSYHNyZq3fjQyzi3Xed7 GJfAABsUbxggmZQ5fBXbUp3W3vsT1qRfQQB1Of5vAVOqLqf5d6/VSIjfLDL2rgEpgjid P2o551XNOEEUn2lnUqdTCrKpdj/smdwXXgyKPeEAcbPawLhZ/SnCso1K1Y7UDnJWoLyE k0SYmrOb0qRLZlOF95GMLicDBpAPrpZCpScLo1Sl11mIyn2pobDL698is73JNASGJ+dM P+ucNx0mnzAvfRNCaMnvIDIF3k8OvqRQdP0DkT9ewi3jM1Xni/gBVgFtu75vcBWmyFvE pVWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EHZZ80ALv+K7PZJdkF1ud/9uldCP93oAdPnykBe3hyM=; b=HItsKY8ZJ8KMbCpfaYdV2/bi4bHmD79gG3kxP0XqRC8oBBOqxIA60eopdnDMz+bHi2 6nj9nqcHHzEUNX7wqtbzaY8vmK+7Y2CC6Q8N0OxnGu0PFBaWRIE5hMR0D1VCArIiXmdN ZSkbAaV1gZigXHtJcTFeQgzvh/FbQKqfFSw59699eck1Ebcg7tJ50F6rI4e58bmCNlCE MjuugndUfQVlYsHU2mkfUAzCvQu4uOtkh8zIW1nWDw53JPw95bX94SeNNmKe1XQQaXmm NvFFzLWDGuAWVM2AeYcIogxV7ntvu/BM5zHFEmBQSsju+MfUYl+D/XchhtFZikXvgl9+ E66A== X-Gm-Message-State: AOAM5323E+zzuKaYTgR2jkdqeSWQqDqzHPwBdt27ijtk/+fStJjJzK+a 8WxiknDYtUMupkvJhNyhpS94mU8wakQ= X-Google-Smtp-Source: ABdhPJxsrxH/RgPlGUzESL8W+U/nOtKp21kusbbQXMkP5Jg8e5za2fzaRniECYWYRp8pcoDGhdBTtA== X-Received: by 2002:a05:6402:350d:b0:419:547f:134a with SMTP id b13-20020a056402350d00b00419547f134amr21657486edd.405.1648822423284; Fri, 01 Apr 2022 07:13:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/17] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak Date: Fri, 1 Apr 2022 16:13:20 +0200 Message-Id: <20220401141326.1244422-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52b (failed) 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::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648823068930100001 Content-Type: text/plain; charset="utf-8" Just check the target name instead. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-11-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/tcg/Makefile.target | 8 ++++---- tests/tcg/configure.sh | 12 +++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index acda5bcec2..c75e8d983f 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -34,7 +34,7 @@ all: -include ../config-$(TARGET).mak =20 # Get semihosting definitions for user-mode emulation -ifeq ($(CONFIG_USER_ONLY),y) +ifeq ($(filter %-softmmu, $(TARGET)),) -include $(SRC_PATH)/configs/targets/$(TARGET).mak endif =20 @@ -44,7 +44,7 @@ COMMA :=3D , quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) =20 # $1 =3D test name, $2 =3D cmd, $3 =3D desc -ifdef CONFIG_USER_ONLY +ifeq ($(filter %-softmmu, $(TARGET)),) run-test =3D $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1= .out, \ "TEST",$3) else @@ -91,7 +91,7 @@ QEMU_OPTS=3D # 90s with --enable-tcg-interpreter TIMEOUT=3D90 =20 -ifdef CONFIG_USER_ONLY +ifeq ($(filter %-softmmu, $(TARGET)),) # The order we include is important. We include multiarch first and # then the target. If there are common tests shared between # sub-targets (e.g. ARM & AArch64) then it is up to @@ -153,7 +153,7 @@ extract-plugin =3D $(wordlist 2, 2, $(subst -with-, ,$1= )) =20 RUN_TESTS+=3D$(EXTRA_RUNS) =20 -ifdef CONFIG_USER_ONLY +ifeq ($(filter %-softmmu, $(TARGET)),) run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") =20 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 57026b5899..0d864c24fc 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -225,18 +225,12 @@ for target in $target_list; do echo "TARGET_NAME=3D$arch" >> $config_target_mak echo "target=3D$target" >> $config_target_mak case $target in - *-linux-user) - echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak - ;; - *-bsd-user) - echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak - ;; *-softmmu) - echo "CONFIG_SOFTMMU=3Dy" >> $config_target_mak echo "QEMU=3D$PWD/qemu-system-$arch" >> $config_target_mak ;; + *-linux-user|*-bsd-user) + echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak + ;; esac =20 eval "target_compiler_cflags=3D\${cross_cc_cflags_$arch}" --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164882293426092.47179469846765; Fri, 1 Apr 2022 07:22:14 -0700 (PDT) Received: from localhost ([::1]:44128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIAH-00012J-7t for importer@patchew.org; Fri, 01 Apr 2022 10:22:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI27-0003mO-NJ for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:47 -0400 Received: from [2a00:1450:4864:20::62b] (port=34344 helo=mail-ej1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI25-0006dY-Ue for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:47 -0400 Received: by mail-ej1-x62b.google.com with SMTP id o10so6193878ejd.1 for ; Fri, 01 Apr 2022 07:13:45 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XYWfkb2s9iXIVRdcJNAHIocSfZ6ohdTAP3coLhBDfr8=; b=SBHiGfWdmG1MLIXBjfKLSOlIdNInrirp2uOPRaXONngIGdyO6QZezQuPAM4MdUg9WU spOeFeJslGGRq4OMCi44ZYdh6AajESjvMVVBA+xbFCQQmRwXCyrB9IVqHcOuN4RLOgB8 lUS3W8j83blMNdkMsuFFw5yXmdAiCsQrW3R2qMEQoTs4a69FBV/7wrf6bblnCcPbO3yM GgHBFOhkkAPDhY9I/YQXPyHZkJv2J8RX+UsSCVx2tmJ8t/spbX2XxgHhW/LdUua1xe4w sIXMyzFKR6QmyIBB77In9gehDdvz8ui3SxMXfqILf6p92r58RSiYQY7U4bRSd3pmO+Vi hjdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XYWfkb2s9iXIVRdcJNAHIocSfZ6ohdTAP3coLhBDfr8=; b=y1tA2FFkw920SfCeKfotOdmECYTX21ILwY0VJjXe2q4rwq6CBxi3mhPdoLu8ZTwgoP xcbghTWNkzRGkiq7JHy1FeWpSCC6JZk5EXp+c+5JJ0A0Gx0SQ1ADO7BdPcupdb+SpFCN caDxgbpoZJ2qHChfDblZ0imaCcs7N4UG5d0Qe/XzQZ8wwToYUpNYh2C8RCXjPWTIeieH EDTEQ2VLPZaNbn2AQeBgN8yoAcNax0hqkdPe1eXp5HWXcvy1Uq1h+2297br/xR4vMJP4 Jylt+Ujn2svrQYxyeFUqfC8X1T+vJtEDSGPYX7hoDHz3oGKF5SWfVvFx8bdx6Tm3+xm7 ma4w== X-Gm-Message-State: AOAM530GTB890a0kvJhOAYIcMUK9UxI1pjmT80JI007pfYwUq0WGlfy7 HS7B32jqEKxme2qPhBgasZ9Zzhzc1Hk= X-Google-Smtp-Source: ABdhPJz1q2+bLmY1uI6aCcDCzGgX/89VOH0bb9jEDZIohM7sHPkkRBYtUd0XWW+FivFSsDFj1eqfRQ== X-Received: by 2002:a17:907:62a1:b0:6da:7952:d4d2 with SMTP id nd33-20020a17090762a100b006da7952d4d2mr42616ejc.260.1648822424169; Fri, 01 Apr 2022 07:13:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 12/17] tests/tcg: prepare Makefile.prereqs at configure time Date: Fri, 1 Apr 2022 16:13:21 +0200 Message-Id: <20220401141326.1244422-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) 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::62b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822936532100001 Content-Type: text/plain; charset="utf-8" List the dependencies of the build-tcg-tests-* and run-tcg-tests-* targets in a Makefile fragment, without going through Makefile.prereqs's "parsing" of config-*.mak. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-12-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 9 ++++++--- tests/tcg/Makefile.prereqs | 18 ------------------ tests/tcg/configure.sh | 10 ++++++++-- 3 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 tests/tcg/Makefile.prereqs diff --git a/tests/Makefile.include b/tests/Makefile.include index 05c534ea56..b5d0d6bc98 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -39,14 +39,17 @@ SPEED =3D quick # Build up our target list from the filtered list of ninja targets TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) =20 +-include tests/tcg/Makefile.prereqs +config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh +tests/tcg/Makefile.prereqs: config-host.mak + # Per guest TCG tests BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGETS)) CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGETS)) RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGETS)) =20 -# Probe for the Docker Builds needed for each build -$(foreach PROBE_TARGET,$(TARGET_DIRS), \ - $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) +$(foreach TARGET,$(TARGETS), \ + $(eval $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak: config-host.ma= k)) =20 $(BUILD_TCG_TARGET_RULES): build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-p= lugins) $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ diff --git a/tests/tcg/Makefile.prereqs b/tests/tcg/Makefile.prereqs deleted file mode 100644 index 9a29604a83..0000000000 --- a/tests/tcg/Makefile.prereqs +++ /dev/null @@ -1,18 +0,0 @@ -# -*- Mode: makefile -*- -# -# TCG Compiler Probe -# -# This Makefile fragment is included multiple times in the main make -# script to probe for available compilers. This is used to build up a -# selection of required docker targets before we invoke a sub-make for -# each target. - -DOCKER_IMAGE:=3D - --include $(BUILD_DIR)/tests/tcg/config-$(PROBE_TARGET).mak - -ifneq ($(DOCKER_IMAGE),) -build-tcg-tests-$(PROBE_TARGET): docker-image-$(DOCKER_IMAGE) -endif -$(BUILD_DIR)/tests/tcg/config_$(PROBE_TARGET).mak: config-host.mak -config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 0d864c24fc..904c351029 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -80,6 +80,8 @@ fi : ${cross_as_tricore=3D"tricore-as"} : ${cross_ld_tricore=3D"tricore-ld"} =20 +makefile=3Dtests/tcg/Makefile.prereqs +: > $makefile for target in $target_list; do arch=3D${target%%-*} =20 @@ -226,14 +228,17 @@ for target in $target_list; do echo "target=3D$target" >> $config_target_mak case $target in *-softmmu) - echo "QEMU=3D$PWD/qemu-system-$arch" >> $config_target_mak + qemu=3D"qemu-system-$arch" ;; *-linux-user|*-bsd-user) - echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak + qemu=3D"qemu-$arch" ;; esac =20 + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile + eval "target_compiler_cflags=3D\${cross_cc_cflags_$arch}" + echo "QEMU=3D$PWD/$qemu" >> $config_target_mak echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_target= _mak =20 got_cross_cc=3Dno @@ -329,6 +334,7 @@ for target in $target_list; do test -n "$container_image"; then for host in $container_hosts; do if test "$host" =3D "$cpu"; then + echo "build-tcg-tests-$target: docker-image-$container_image= " >> $makefile echo "DOCKER_IMAGE=3D$container_image" >> $config_target_mak echo "DOCKER_CROSS_CC_GUEST=3D$container_cross_cc" >> \ $config_target_mak --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164882321294762.77213268484445; Fri, 1 Apr 2022 07:26:52 -0700 (PDT) Received: from localhost ([::1]:60800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIEl-0003pm-TA for importer@patchew.org; Fri, 01 Apr 2022 10:26:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI28-0003ne-31 for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:48 -0400 Received: from [2a00:1450:4864:20::530] (port=42573 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI26-0006de-7H for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:47 -0400 Received: by mail-ed1-x530.google.com with SMTP id a17so3099126edm.9 for ; Fri, 01 Apr 2022 07:13:45 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S2NqiyeeSPW3e5hVpO2cR6jIRbiczXLcaet/rTv7pF4=; b=YHcLDX2FilnKzd9OndVAqmHScClsAYXhyuVlgRod5f9JoXMRk59F2LY8RJhfRkvS6z Fi3uAQL8js8J0ZoFebRckmSsdILpNoUoQBrJ9W+Ge8PfFDQmgRr/i6QlJu7JNj+ftRuQ gLnYHW61znEodzgBAeavDv8gPhS6my15EH3chnOBv8Szpigq62Vb8uEMb60S3O1H7NxO TgK4M3ZgpouvJLDfROY1/llQKzOORXyk4nfM8k4bfpmgpneY2dLTZk8wCOWbgKlTK522 3PbZRgNNkx9Yy8yT/jXTUb7XXLjlgrwqukNFRdxGao3fTm4Lpzzw/3ID6z8jSCTZRzQM GN+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=S2NqiyeeSPW3e5hVpO2cR6jIRbiczXLcaet/rTv7pF4=; b=cjkbElLeRZVymQNCt7cHpcUpsr9dSMYaAFuXUcS6kMsLEW2o4aCC1hk2j7b3E+G2ZU qHXeNP+751aA1+bYctzifv8+m+UkZjxn+rM43orRgqP7KLm7J/L4KxZ6adrbjZ/RvKfF k76DgfQLFv9ueBC9MsY0hxmPqEavZGA3oRMoyCvqAnvSdwzs2FyUWmpXbyZeZ9eOUqJl ERu2Sl9vfnaY5aZMOcQYoS9qcCG3pRdgk9Dre/i4erwj8KWXKJ0LrqFWMMkHXYW/FXPr Rd6PmCtlFAFOjeXydF4k7CU9zP8Pyb3BpCm+VDU2uMvWEXhnDSKVmV1Dr470TUxS/Edf uZMg== X-Gm-Message-State: AOAM531bwB8aAf/MxgNu3eZ8P0rnwf7xDNJGrZdeuwXrb7jKNug9te1P FFc7Hv/HY60AavkMoqp4T256SgoTzcg= X-Google-Smtp-Source: ABdhPJw6hpZVqffweBaPhK2mQCBiWTWlcU0RT46RoolkKg+JkTFdxGtbFiknW47IK4nV7ipHnC09Mw== X-Received: by 2002:a05:6402:4491:b0:419:4aeb:a648 with SMTP id er17-20020a056402449100b004194aeba648mr21431284edb.411.1648822424966; Fri, 01 Apr 2022 07:13:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 13/17] tests/tcg: list test targets in Makefile.prereqs Date: Fri, 1 Apr 2022 16:13:22 +0200 Message-Id: <20220401141326.1244422-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) 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::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648823213833100001 Content-Type: text/plain; charset="utf-8" Omit the rules altogether for targets that do not have a compiler. Makefile.qemu now is only invoked if the tests are actually built/run. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-13-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 14 +++++++------- tests/tcg/Makefile.qemu | 11 ----------- tests/tcg/configure.sh | 17 ++++++++++++----- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index b5d0d6bc98..091ca8513f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -36,19 +36,16 @@ export SRC_PATH =20 SPEED =3D quick =20 -# Build up our target list from the filtered list of ninja targets -TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) - -include tests/tcg/Makefile.prereqs config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh tests/tcg/Makefile.prereqs: config-host.mak =20 # Per guest TCG tests -BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGETS)) -CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGETS)) -RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGETS)) +BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TCG_TESTS_TARGE= TS)) +CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TCG_TESTS_TARGE= TS)) +RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TCG_TESTS_TARGETS)) =20 -$(foreach TARGET,$(TARGETS), \ +$(foreach TARGET,$(TCG_TESTS_TARGETS), \ $(eval $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak: config-host.ma= k)) =20 $(BUILD_TCG_TARGET_RULES): build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-p= lugins) @@ -84,6 +81,9 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 .PHONY: check-venv check-avocado check-acceptance check-acceptance-depreca= ted-warning =20 +# Build up our target list from the filtered list of ninja targets +TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) + TESTS_VENV_DIR=3D$(BUILD_DIR)/tests/venv TESTS_VENV_REQ=3D$(SRC_PATH)/tests/requirements.txt TESTS_RESULTS_DIR=3D$(BUILD_DIR)/tests/results diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index 84c8543878..cda5e5a33e 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -95,7 +95,6 @@ all: =20 .PHONY: guest-tests =20 -ifneq ($(GUEST_BUILD),) guest-tests: $(GUEST_BUILD) =20 run-guest-tests: guest-tests @@ -105,16 +104,6 @@ run-guest-tests: guest-tests SRC_PATH=3D"$(SRC_PATH)" SPEED=3D$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)") =20 -else -guest-tests: - $(call quiet-command, true, "BUILD", \ - "$(TARGET) guest-tests SKIPPED") - -run-guest-tests: - $(call quiet-command, true, "RUN", \ - "tests for $(TARGET) SKIPPED") -endif - # It doesn't matter if these don't exits .PHONY: clean-guest-tests clean-guest-tests: diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 904c351029..e51cd56b60 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -81,7 +81,9 @@ fi : ${cross_ld_tricore=3D"tricore-ld"} =20 makefile=3Dtests/tcg/Makefile.prereqs -: > $makefile +echo "# Automatically generated by configure - do not modify" > $makefile + +tcg_tests_targets=3D for target in $target_list; do arch=3D${target%%-*} =20 @@ -228,6 +230,7 @@ for target in $target_list; do echo "target=3D$target" >> $config_target_mak case $target in *-softmmu) + test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || cont= inue qemu=3D"qemu-system-$arch" ;; *-linux-user|*-bsd-user) @@ -235,11 +238,7 @@ for target in $target_list; do ;; esac =20 - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile - eval "target_compiler_cflags=3D\${cross_cc_cflags_$arch}" - echo "QEMU=3D$PWD/$qemu" >> $config_target_mak - echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_target= _mak =20 got_cross_cc=3Dno =20 @@ -362,8 +361,16 @@ for target in $target_list; do echo "CROSS_CC_HAS_I386_NOPIE=3Dy" >> $config_target= _mak ;; esac + got_cross_cc=3Dyes break fi done fi + if test $got_cross_cc =3D yes; then + echo "QEMU=3D$PWD/$qemu" >> $config_target_mak + echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_ta= rget_mak + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile + tcg_tests_targets=3D"$tcg_tests_targets $target" + fi done +echo "TCG_TESTS_TARGETS=3D$tcg_tests_targets" >> $makefile --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648823072755261.7961250349847; Fri, 1 Apr 2022 07:24:32 -0700 (PDT) Received: from localhost ([::1]:52780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naICV-0006sj-Kp for importer@patchew.org; Fri, 01 Apr 2022 10:24:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI2D-00047x-AJ for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:53 -0400 Received: from [2a00:1450:4864:20::62e] (port=36785 helo=mail-ej1-x62e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI27-0006ds-JI for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:53 -0400 Received: by mail-ej1-x62e.google.com with SMTP id k23so2694063ejd.3 for ; Fri, 01 Apr 2022 07:13:47 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=55bDDPjorfrhLfpzYQWb1AXkVQNF3GZ0BEJsxunEeXI=; b=ULW8FkpO/3dqpWN7BnCn/Ct8JaglZC1B9WQp3Vzrj3303nGpMGtDbSnnnP5S57+Dsm iyzMePyDrKYkY18QYMQgCchk/12z9zAPWb7ZdI5QpnJrqW7AD2xtY757yayd7tkzDVcL tH+LQOtCOjVDwnFp6lIppaBufAjn8jgYvRhdmY5YLPbqJSFiS4EZKznW/Qah0oDpgq2O QTd9MYYguJ3naXlTwlCOu3L4QZ7iQ9yzUwClgfYn/IR65om+gVuq0QOaAftHm0h1Cd4s rKA/Hzj/Ce/xKdxG46JxgdCGd+tAaU6ASVery+vvQ2uKyEKay+yqgZowbcmI+m4I76eL tUSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=55bDDPjorfrhLfpzYQWb1AXkVQNF3GZ0BEJsxunEeXI=; b=NlNBSxBWWTf+X2z0Sr31h6b5VyFnyp4wmq5o6Qw6UH0Yz9SBLZ23wsoQyBPP0HEAsv 82ZujHTUsL4aIAj2j9rXawZYHb8/IHan5kFf4yklOZlHi2Um/c4MjFqlbpc6jnmhq6S4 srXttUxAjmTbOKTWD/BSyzgglKFNonnEm83KXuOyqcJC4TZZXgFCSjZfEAiApT35/xhA 0+QKhsQXZ/E7zbqBhqOnAEx3VPwBRKGayBpoZphuQ6/KEk8kSSS0ZAPpl9raPgSe4rhM u14PxR6K+dF6aHI5P/++6Vqc/FxqFZ0d4eHfFiMUKsbXn2s4PX5rbi09/8tOXV0lU5g2 8iWw== X-Gm-Message-State: AOAM532IF6i3Fmj1zm4+pWxEHcngF5FnIHfAnYQUEKPN8L06QJRj4YOm +KQrbnHEzNtV22cOUnEHC8yrMwGAH2I= X-Google-Smtp-Source: ABdhPJwNLDRs7CGWCJolW6aaIyOGQldj36GPi6XrcLS5Q7J4QTbIUBKJXw+vpx4aoBBrs0MWLBraiQ== X-Received: by 2002:a17:906:a1c8:b0:6da:a635:e402 with SMTP id bx8-20020a170906a1c800b006daa635e402mr24252ejb.598.1648822425921; Fri, 01 Apr 2022 07:13:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 14/17] tests/tcg: invoke Makefile.target directly from QEMU's makefile Date: Fri, 1 Apr 2022 16:13:23 +0200 Message-Id: <20220401141326.1244422-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62e (failed) 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::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648823074930100001 Content-Type: text/plain; charset="utf-8" Build the "docker.py cc" invocation directly in tests/tcg/configure.sh, and remove the Makefile.qemu wrapper around Makefile.target. The config-*.mak files now include the actual variables used when building the tests, rather than the CROSS_* variables that Makefile.qemu used to "translate". This is a first step towards generalizing the cross-compilation infrastruct= ure so that it can be used for firmware as well. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-14-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 36 +++++++------ tests/tcg/Makefile.qemu | 110 -------------------------------------- tests/tcg/Makefile.target | 3 +- tests/tcg/configure.sh | 28 +++++----- 4 files changed, 33 insertions(+), 144 deletions(-) delete mode 100644 tests/tcg/Makefile.qemu diff --git a/tests/Makefile.include b/tests/Makefile.include index 091ca8513f..ec84b2ebc0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -48,25 +48,27 @@ RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(= TCG_TESTS_TARGETS)) $(foreach TARGET,$(TCG_TESTS_TARGETS), \ $(eval $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak: config-host.ma= k)) =20 -$(BUILD_TCG_TARGET_RULES): build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-p= lugins) - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ - -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ - SRC_PATH=3D$(SRC_PATH) \ - V=3D"$(V)" TARGET=3D"$*" guest-tests, \ - "BUILD", "TCG tests for $*") +.PHONY: $(TCG_TESTS_TARGETS:%=3Dbuild-tcg-tests-%) +$(TCG_TESTS_TARGETS:%=3Dbuild-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR= )/tests/tcg/config-%.mak + $(call quiet-command, \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLA= GS) \ + DOCKER_SCRIPT=3D"$(DOCKER_SCRIPT)" \ + TARGET=3D"$*" SRC_PATH=3D"$(SRC_PATH)", \ + "BUILD","$* guest-tests") =20 -$(RUN_TCG_TARGET_RULES): run-tcg-tests-%: build-tcg-tests-% all - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ - -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ - SRC_PATH=3D$(SRC_PATH) SPEED=3D"$(SPEED)" \ - V=3D"$(V)" TARGET=3D"$*" run-guest-tests, \ - "RUN", "TCG tests for $*") +.PHONY: $(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%) +$(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%): run-tcg-tests-%: build-tcg-tests= -% $(if $(CONFIG_PLUGIN),test-plugins) + $(call quiet-command, \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAG= S) \ + TARGET=3D"$*" SRC_PATH=3D"$(SRC_PATH)" SPEED=3D$(S= PEED) run, \ + "RUN", "$* guest-tests") =20 -$(CLEAN_TCG_TARGET_RULES): clean-tcg-tests-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ - -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ - SRC_PATH=3D$(SRC_PATH) TARGET=3D"$*" clean-guest-tests, \ - "CLEAN", "TCG tests for $*") +.PHONY: $(TCG_TESTS_TARGETS:%=3Dclean-tcg-tests-%) +$(TCG_TESTS_TARGETS:%=3Dclean-tcg-tests-%): clean-tcg-tests-%: + $(call quiet-command, \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAG= S) \ + TARGET=3D"$*" SRC_PATH=3D"$(SRC_PATH)" clean, \ + "CLEAN", "$* guest-tests") =20 .PHONY: build-tcg build-tcg: $(BUILD_TCG_TARGET_RULES) diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu deleted file mode 100644 index cda5e5a33e..0000000000 --- a/tests/tcg/Makefile.qemu +++ /dev/null @@ -1,110 +0,0 @@ -# -*- Mode: makefile -*- -# -# TCG tests (per-target rules) -# -# This Makefile fragment is included from the build-tcg target, once -# for each target we build. We have two options for compiling, either -# using a configured guest compiler or calling one of our docker images -# to do it for us. -# - -# The configure script fills in extra information about -# useful docker images or alternative compiler flags. - -# Usage: $(call quiet-command,command and args,"NAME","args to print") -# This will run "command and args", and either: -# if V=3D1 just print the whole command and args -# otherwise print the 'quiet' output in the format " NAME args to pr= int" -# NAME should be a short name of the command, 7 letters or fewer. -# If called with only a single argument, will print nothing in quiet mode. -quiet-command-run =3D $(if $(V),,$(if $2,printf " %-7s %s\n" $2 $3 && ))$1 -quiet-@ =3D $(if $(V),,@) -quiet-command =3D $(quiet-@)$(call quiet-command-run,$1,$2,$3) - -CROSS_CC_GUEST:=3D -CROSS_AS_GUEST:=3D -CROSS_LD_GUEST:=3D -DOCKER_IMAGE:=3D - --include tests/tcg/config-$(TARGET).mak - -GUEST_BUILD=3D -TCG_MAKE=3D../Makefile.target - -# We also need the Docker make rules to depend on -SKIP_DOCKER_BUILD=3D1 -include $(SRC_PATH)/tests/docker/Makefile.include - -# Support installed Cross Compilers - -ifdef CROSS_CC_GUEST - -.PHONY: cross-build-guest-tests -cross-build-guest-tests: - $(call quiet-command, \ - (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ - $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" CC=3D"$(CROSS_CC_GUEST)" \ - $(if $(CROSS_AS_GUEST),AS=3D"$(CROSS_AS_GUEST)") \ - $(if $(CROSS_LD_GUEST),LD=3D"$(CROSS_LD_GUEST)") \ - SRC_PATH=3D"$(SRC_PATH)" BUILD_STATIC=3D$(CROSS_CC_GUEST_STATIC) \ - EXTRA_CFLAGS=3D"$(CROSS_CC_GUEST_CFLAGS)"), \ - "BUILD","$(TARGET) guest-tests with $(CROSS_CC_GUEST)") - -GUEST_BUILD=3Dcross-build-guest-tests - -endif - -# Support building with Docker - -ifneq ($(DOCKER_IMAGE),) - -DOCKER_COMPILE_CMD=3D"$(DOCKER_SCRIPT) cc \ - --cc $(DOCKER_CROSS_CC_GUEST) \ - -i qemu/$(DOCKER_IMAGE) \ - -s $(SRC_PATH) -- " - -DOCKER_AS_CMD=3D$(if $(DOCKER_CROSS_AS_GUEST),"$(DOCKER_SCRIPT) cc \ - --cc $(DOCKER_CROSS_AS_GUEST) \ - -i qemu/$(DOCKER_IMAGE) \ - -s $(SRC_PATH) -- ") - -DOCKER_LD_CMD=3D$(if $(DOCKER_CROSS_LD_GUEST),"$(DOCKER_SCRIPT) cc \ - --cc $(DOCKER_CROSS_LD_GUEST) \ - -i qemu/$(DOCKER_IMAGE) \ - -s $(SRC_PATH) -- ") - - -.PHONY: docker-build-guest-tests -docker-build-guest-tests: docker-image-$(DOCKER_IMAGE) - $(call quiet-command, \ - (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ - $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" CC=3D$(DOCKER_COMPILE_CMD)= \ - $(if $(DOCKER_AS_CMD),AS=3D$(DOCKER_AS_CMD)) \ - $(if $(DOCKER_LD_CMD),LD=3D$(DOCKER_LD_CMD)) \ - SRC_PATH=3D"$(SRC_PATH)" BUILD_STATIC=3Dy \ - EXTRA_CFLAGS=3D"$(CROSS_CC_GUEST_CFLAGS)"), \ - "BUILD","$(TARGET) guest-tests with docker qemu/$(DOCKER_IMAGE)") - -GUEST_BUILD=3Ddocker-build-guest-tests - -endif - -# Final targets -all: - @echo "Do not invoke this Makefile directly"; exit 1 - -.PHONY: guest-tests - -guest-tests: $(GUEST_BUILD) - -run-guest-tests: guest-tests - $(call quiet-command, \ - (cd tests/tcg/$(TARGET) && \ - $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" \ - SRC_PATH=3D"$(SRC_PATH)" SPEED=3D$(SPEED) run), \ - "RUN", "tests for $(TARGET_NAME)") - -# It doesn't matter if these don't exits -.PHONY: clean-guest-tests -clean-guest-tests: - rm -rf tests/tcg/$(TARGET) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index c75e8d983f..95499d8c9b 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -187,4 +187,5 @@ gdb-%: % .PHONY: run run: $(RUN_TESTS) =20 -# There is no clean target, the calling make just rm's the tests build dir +clean: + rm -f $(TESTS) *.o diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index e51cd56b60..a577dd7ece 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -227,7 +227,6 @@ for target in $target_list; do =20 echo "# Automatically generated by configure - do not modify" > $config_= target_mak echo "TARGET_NAME=3D$arch" >> $config_target_mak - echo "target=3D$target" >> $config_target_mak case $target in *-softmmu) test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || cont= inue @@ -257,13 +256,13 @@ for target in $target_list; do if do_compiler "$target_compiler" $target_compiler_cflag= s \ -o $TMPE $TMPC ; then got_cross_cc=3Dyes - echo "CROSS_CC_GUEST_STATIC=3Dy" >> $config_target_m= ak - echo "CROSS_CC_GUEST=3D$target_compiler" >> $config_= target_mak + echo "BUILD_STATIC=3Dy" >> $config_target_mak + echo "CC=3D$target_compiler" >> $config_target_mak fi else got_cross_cc=3Dyes - echo "CROSS_CC_GUEST_STATIC=3Dy" >> $config_target_mak - echo "CROSS_CC_GUEST=3D$target_compiler" >> $config_targ= et_mak + echo "BUILD_STATIC=3Dy" >> $config_target_mak + echo "CC=3D$target_compiler" >> $config_target_mak fi fi fi @@ -274,9 +273,8 @@ for target in $target_list; do if has $target_as && has $target_ld; then case $target in tricore-softmmu) - echo "CROSS_CC_GUEST=3D$target_as" >> $config_target_mak - echo "CROSS_AS_GUEST=3D$target_as" >> $config_target_mak - echo "CROSS_LD_GUEST=3D$target_ld" >> $config_target_mak + echo "AS=3D$target_as" >> $config_target_mak + echo "LD=3D$target_ld" >> $config_target_mak got_cross_cc=3Dyes ;; esac @@ -334,16 +332,13 @@ for target in $target_list; do for host in $container_hosts; do if test "$host" =3D "$cpu"; then echo "build-tcg-tests-$target: docker-image-$container_image= " >> $makefile - echo "DOCKER_IMAGE=3D$container_image" >> $config_target_mak - echo "DOCKER_CROSS_CC_GUEST=3D$container_cross_cc" >> \ - $config_target_mak + echo "BUILD_STATIC=3Dy" >> $config_target_mak + echo "CC=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i = qemu/$container_image -s $source_path --" >> $config_target_mak if test -n "$container_cross_as"; then - echo "DOCKER_CROSS_AS_GUEST=3D$container_cross_as" >> \ - $config_target_mak + echo "AS=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_as= -i qemu/$container_image -s $source_path --" >> $config_target_mak fi if test -n "$container_cross_ld"; then - echo "DOCKER_CROSS_LD_GUEST=3D$container_cross_ld" >> \ - $config_target_mak + echo "LD=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_ld= -i qemu/$container_image -s $source_path --" >> $config_target_mak fi case $target in aarch64-*) @@ -367,8 +362,9 @@ for target in $target_list; do done fi if test $got_cross_cc =3D yes; then + mkdir -p tests/tcg/$target echo "QEMU=3D$PWD/$qemu" >> $config_target_mak - echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_ta= rget_mak + echo "EXTRA_CFLAGS=3D$target_compiler_cflags" >> $config_target_mak echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile tcg_tests_targets=3D"$tcg_tests_targets $target" fi --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648822977047554.9499877259798; Fri, 1 Apr 2022 07:22:57 -0700 (PDT) Received: from localhost ([::1]:46754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIAx-0002rv-NX for importer@patchew.org; Fri, 01 Apr 2022 10:22:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI29-0003uV-SK for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:49 -0400 Received: from [2a00:1450:4864:20::629] (port=34343 helo=mail-ej1-x629.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI28-0006dx-6E for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:49 -0400 Received: by mail-ej1-x629.google.com with SMTP id o10so6194128ejd.1 for ; Fri, 01 Apr 2022 07:13:47 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RvElqCJJdwBtUSZcN/Vs6DfBOSLpxpu+Vo0U1giLeAk=; b=nmb4CEVAvQNns1Cb9D8S6pWpraIMIG+1nytWK6pBSI0u9lQ+cbPNJn1ZUbtBEVMuzR JqKGNnZDlnyeKvrfUbYssDfCWdrmMD7e/ZePvCM8WeVlC9comY06uyp7rgKAr0EBUeOv U8/YzzS5kvOSAmd8WCl8YCOHZ2+63UQSz4gRAAFAuNOGiqNzA9Sp2q7JranE+YPUrMGr Leo6SunQpgCBP0wvyAyxgoR+D7Lh5KejMBRSBoxlUrgqh3tkh0qk2qSPJYymES5AmJff UTIfMKmJoPTYzFGYMjG9acBHF8GXMZyP/wRto9GjcjuJtatyWI59WXhh0NGgbNikTpti LKqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RvElqCJJdwBtUSZcN/Vs6DfBOSLpxpu+Vo0U1giLeAk=; b=Hu7WGkq+jJ/16YZE2yuvo4boJ7HErgl+jeNf/07UtJGzK7N3CqPA/oHDx9Tl6ZKNGK DSqoXJfR/UAr3s12Ry2waxD9jCUSL6nnqhUS1jzBe7JhEPkoSJ4KxBN0JE9ZURnwneam SALRG9mW3aSAAfm44RgBYrrBLprgT7GCGgDPdHq2yxbcyholDHejk+ZLV78wCEFQizc0 urAemMhHqwMt8mOkkmFukmNQN0bbLZIteNawqX3HTcCfxQBcFpNfh8el7Af9431zmt14 fb5VcFczEzL8BAoSXd3x9Pk0tl2QB4VwMJjhl4O6rWcEOCA+BSCM3+2rrWG4K2fHWGDU MNkA== X-Gm-Message-State: AOAM532clMLz5wIXVIL/62YcVWSG4XL/rbvGHKPPYmYmjGXvL41CnQK4 Vl2agZFa7CRHf35kcm28taBuYyj17mQ= X-Google-Smtp-Source: ABdhPJz2ipLZwLOBbHNKYHdNc/uTbfKLPlg/9uxqo1DtI/xKqOQ3HDGqrRcwpTaskrP5QQeTa8+qHw== X-Received: by 2002:a17:907:8d1a:b0:6e0:6db8:8042 with SMTP id tc26-20020a1709078d1a00b006e06db88042mr41968ejc.300.1648822426858; Fri, 01 Apr 2022 07:13:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 15/17] tests/tcg: isolate from QEMU's config-host.mak Date: Fri, 1 Apr 2022 16:13:24 +0200 Message-Id: <20220401141326.1244422-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::629 (failed) 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=paolo.bonzini@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648822978909100001 Content-Type: text/plain; charset="utf-8" Do not include variables for the QEMU's own compiler, as they are not necessarily related to the cross compiler used for tests/tcg. Signed-off-by: Paolo Bonzini --- configure | 3 +-- tests/tcg/Makefile.target | 3 +-- tests/tcg/configure.sh | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 7c08c18358..e8786d478e 100755 --- a/configure +++ b/configure @@ -2937,7 +2937,6 @@ echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak -echo "HOST_CC=3D$host_cc" >> $config_host_mak echo "AR=3D$ar" >> $config_host_mak echo "AS=3D$as" >> $config_host_mak echo "CCAS=3D$ccas" >> $config_host_mak @@ -3057,7 +3056,7 @@ done (for i in $cross_cc_vars; do export $i done -export target_list source_path use_containers cpu +export target_list source_path use_containers cpu host_cc $source_path/tests/tcg/configure.sh) =20 # temporary config to build submodules diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 95499d8c9b..f427a0304e 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -30,7 +30,7 @@ # =20 all: --include ../../../config-host.mak +-include ../config-host.mak -include ../config-$(TARGET).mak =20 # Get semihosting definitions for user-mode emulation @@ -77,7 +77,6 @@ EXTRA_TESTS=3D =20 # Start with a blank slate, the build targets get to add stuff first CFLAGS=3D -QEMU_CFLAGS=3D LDFLAGS=3D =20 QEMU_OPTS=3D diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index a577dd7ece..75603fee6d 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -83,6 +83,11 @@ fi makefile=3Dtests/tcg/Makefile.prereqs echo "# Automatically generated by configure - do not modify" > $makefile =20 +config_host_mak=3Dtests/tcg/config-host.mak +echo "# Automatically generated by configure - do not modify" > $config_ho= st_mak +echo "SRC_PATH=3D$source_path" >> $config_host_mak +echo "HOST_CC=3D$host_cc" >> $config_host_mak + tcg_tests_targets=3D for target in $target_list; do arch=3D${target%%-*} --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648823307040301.37219387809193; Fri, 1 Apr 2022 07:28:27 -0700 (PDT) Received: from localhost ([::1]:35844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIGI-00067i-3O for importer@patchew.org; Fri, 01 Apr 2022 10:28:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI2B-0003zj-7O for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:51 -0400 Received: from [2a00:1450:4864:20::62e] (port=45832 helo=mail-ej1-x62e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI29-0006eF-4l for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:50 -0400 Received: by mail-ej1-x62e.google.com with SMTP id i16so6068749ejk.12 for ; Fri, 01 Apr 2022 07:13:48 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mVMoyQUwRyf0fLFyo8grOh4IVJlHfanRANKzcd9NF3I=; b=doCQls8GxR4Hfs8VXhabLjDifj5ZssuJb1VzxBHnXOAdi0cyaujdaP1YdQiZulnyJA CwC+Jdo1xlTwtFNFNuuArTb8vIddhLVMsGZzmtF8osIHz7eTVxrCCp03gKoFmdRSs1Uf i7Aj4+cqPkGz8tpypnOEtoZ4S33QLaUNNyQ8uuABvZw8kI/a6R/uq9LWYurudpmHAjmp eCv3hZ2ScgxToE9u+pqf/e4ozQp01C1gfhwVEVXb37srEPErAVpz62NxkJgv8RbRUR1X P9NGOJK/PctFrPHrPWDp3+YYC7L2NkwCt8JlkULxtFBXRTsoBhMecDOIxfUmtB0zFjlg jgTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mVMoyQUwRyf0fLFyo8grOh4IVJlHfanRANKzcd9NF3I=; b=KaMeaVrNKNqVpSFHgGbrASn5OHdZosE6jgXHv2cAXYdOHyS8zjxazRvnfLsyq8SCbN GBaBy7Gnf96VPIWn9onUkDAavYIh3X+UAmosrw7nT5dhR0tv4uR3KKE5dvtsN2GsWPUV bTa2LkP+7vxL/+ku/jI4mFY0TfUYPQEa093F9KELtCy1854jKIxBQbrwdSVRS/piHtgh i4g7TkTDoo44rnd/3Hmd3njdPcQs2wKe21ORHukyrqFZHVYBQrOcRV9BLS4FFy4/wQzG prmQ3QydJCSz3e0l6hN5Tk0ge0w/elA+uXakOY93oD0Smbl6khcvU/su70+MngbbTV86 KZPA== X-Gm-Message-State: AOAM5328tQrKuFQ4yz5tF2boba4zbPsoJQ+7E2qf/JWsrCR1J/W0CMl6 f9ZZT8jIiXOc1B/GOxL8/+i3yYdZlcM= X-Google-Smtp-Source: ABdhPJw5bFY5rzDtd0SX5mDgbrQ2sHdWkAejy14yeFrKoeWCRc8FmwqRzrk0SuBNkRhXINWqwSK9yQ== X-Received: by 2002:a17:907:6e93:b0:6df:8c1a:d08b with SMTP id sh19-20020a1709076e9300b006df8c1ad08bmr9447270ejc.557.1648822427791; Fri, 01 Apr 2022 07:13:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 16/17] tests/docker: remove SKIP_DOCKER_BUILD Date: Fri, 1 Apr 2022 16:13:25 +0200 Message-Id: <20220401141326.1244422-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62e (failed) 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::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648823308560100001 Content-Type: text/plain; charset="utf-8" It is now unused. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-15-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 12 +------- tests/docker/docker.py | 57 ----------------------------------- 2 files changed, 1 insertion(+), 68 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index eb100c294f..ca2157db46 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -33,15 +33,7 @@ $(DOCKER_SRC_COPY): =20 docker-qemu-src: $(DOCKER_SRC_COPY) =20 -# General rule for building docker images. If we are a sub-make -# invoked with SKIP_DOCKER_BUILD we still check the image is up to date -# though -ifdef SKIP_DOCKER_BUILD -docker-image-%: $(DOCKER_FILES_DIR)/%.docker - $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu/$* $<, \ - "CHECK", "$*") -else +# General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ $(DOCKER_SCRIPT) build -t qemu/$* -f $< \ @@ -77,8 +69,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-= bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 -endif - # Enforce dependencies for composite images # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 78dd13171e..d0af2861b8 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -676,63 +676,6 @@ def run(self, args, argv): as_user=3DTrue) =20 =20 -class CheckCommand(SubCommand): - """Check if we need to re-build a docker image out of a dockerfile. - Arguments: """ - name =3D "check" - - def args(self, parser): - parser.add_argument("tag", - help=3D"Image Tag") - parser.add_argument("dockerfile", default=3DNone, - help=3D"Dockerfile name", nargs=3D'?') - parser.add_argument("--checktype", choices=3D["checksum", "age"], - default=3D"checksum", help=3D"check type") - parser.add_argument("--olderthan", default=3D60, type=3Dint, - help=3D"number of minutes") - - def run(self, args, argv): - tag =3D args.tag - - try: - dkr =3D Docker() - except subprocess.CalledProcessError: - print("Docker not set up") - return 1 - - info =3D dkr.inspect_tag(tag) - if info is None: - print("Image does not exist") - return 1 - - if args.checktype =3D=3D "checksum": - if not args.dockerfile: - print("Need a dockerfile for tag:%s" % (tag)) - return 1 - - dockerfile =3D _read_dockerfile(args.dockerfile) - - if dkr.image_matches_dockerfile(tag, dockerfile): - if not args.quiet: - print("Image is up to date") - return 0 - else: - print("Image needs updating") - return 1 - elif args.checktype =3D=3D "age": - timestr =3D dkr.get_image_creation_time(info).split(".")[0] - created =3D datetime.strptime(timestr, "%Y-%m-%dT%H:%M:%S") - past =3D datetime.now() - timedelta(minutes=3Dargs.olderthan) - if created < past: - print ("Image created @ %s more than %d minutes old" % - (timestr, args.olderthan)) - return 1 - else: - if not args.quiet: - print ("Image less than %d minutes old" % (args.oldert= han)) - return 0 - - def main(): global USE_ENGINE =20 --=20 2.35.1 From nobody Sun Feb 8 20:08:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648823400338384.05134631163924; Fri, 1 Apr 2022 07:30:00 -0700 (PDT) Received: from localhost ([::1]:40426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIHn-0000qL-DW for importer@patchew.org; Fri, 01 Apr 2022 10:29:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naI2B-00041B-IA for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:51 -0400 Received: from [2a00:1450:4864:20::62b] (port=43006 helo=mail-ej1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naI2A-0006eK-2T for qemu-devel@nongnu.org; Fri, 01 Apr 2022 10:13:51 -0400 Received: by mail-ej1-x62b.google.com with SMTP id j15so6104416eje.9 for ; Fri, 01 Apr 2022 07:13:49 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bn3-20020a170906c0c300b006e50416e24bsm212595ejb.98.2022.04.01.07.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 07:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e5NK+IBafbABoMZkfxnbwRAIBUXFveQkCRnSRQFORZU=; b=KnWaiNGkAbreFqbfh6PE6pNNpvdi7cmv8yv3wiChdPEfNaxxhv3QUCo0ja7RimwdIs 4HC/2CKR58obTc75D5olExxhnHBY9xn8gMrgCAXWawN48aS3kVAXzzhNDhPg97rQA5rZ ThZCZbI20thCnMQVuEGoTGLgrPW3p6CTWG6B8yVwduOSZJd6134Nm4rCga1W4Tzm5wDb WWWSq3MuVtvQc0B+SMoBhiSwb5yYpx4BQ387r3feIanSFqUMxEcnd7mwNj+DKuwiPZZ9 dF8bGGhZFKfwm/Pz33IjtljZhIprLASgfTZYGcABLf6oSqK0eP7i4C1z2M7JICOYEKjF Qryg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=e5NK+IBafbABoMZkfxnbwRAIBUXFveQkCRnSRQFORZU=; b=y/LcguTLSehGsDoJ7xvTN4QOLQz9oU0ZC57mItnikYzsWb86fuoVtQ4euAlbINtqhh n/y9z2/cuO/LWats6P6ffDxgy9IUVRkQE0/F2qjE5KJvjw8yMhybPil6E+KUb79Hefum n86Cgr8fJB4R8gb9OpvC0z1dIomFHRYQPv4uAvl230leeOmyz3M/5ET8tmsPGqGAO/vl N5A3ZEWMIKa1r3Ts4MVnMtmNmuJdbTanH9DRjCpEp4WeZTTG+VnPvimZyibpOaYaUlUk W5Tl6701uxOgmmtve5mqqk5sVvIY7ObDPHuOfPRbyJ3gMhUXidhoo3VsXceZf8WyABeN Eycg== X-Gm-Message-State: AOAM533tDCOVv9ypbAoCVbFLyyx3cm5u+hr0ajEf0nAw7YdZAHwGP0RV gKT90Hxtg8yToUikKAHuLlZ5LQP3tyE= X-Google-Smtp-Source: ABdhPJwOTHgMWkkdyE7u5AGUL2GvnPTh3Qw8Zdg7oBnHIjRDty7b4YG+lBwFD5CKBRBb+5IGE7LOvQ== X-Received: by 2002:a17:907:1b10:b0:6e4:bac5:f080 with SMTP id mp16-20020a1709071b1000b006e4bac5f080mr55886ejc.24.1648822428745; Fri, 01 Apr 2022 07:13:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 17/17] tests/tcg: fix non-static build Date: Fri, 1 Apr 2022 16:13:26 +0200 Message-Id: <20220401141326.1244422-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401141326.1244422-1-pbonzini@redhat.com> References: <20220401141326.1244422-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) 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::62b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: richard.henderson@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1648823401184100001 Content-Type: text/plain; charset="utf-8" If linking with -static fails at configure time, -static should not be used at build time either. Do not include BUILD_STATIC in $config_target_mak. Signed-off-by: Paolo Bonzini Message-Id: <20220328140240.40798-16-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/tcg/configure.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 75603fee6d..691d90abac 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -261,7 +261,6 @@ for target in $target_list; do if do_compiler "$target_compiler" $target_compiler_cflag= s \ -o $TMPE $TMPC ; then got_cross_cc=3Dyes - echo "BUILD_STATIC=3Dy" >> $config_target_mak echo "CC=3D$target_compiler" >> $config_target_mak fi else --=20 2.35.1