From nobody Mon Feb 9 23:07:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1648476812; cv=none; d=zohomail.com; s=zohoarc; b=iQK4CskAGmZXnrzQL0PLxamaOKkFXTEGd3x1vQSjdM+KyMfl5F3tW7x7/nkRnt7/0dYxGFkaAtVzSDfJdVCR0fgWREqamTTTbBwUI/gipszEaGqeu67/9J4KtCio/EtFwxmuSDaT2PurxKS+SF9uCUqPRYnN1WXUXUzJWszgSrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vUKEhOLmQYygLsYrpMsrIXKdNdC6DWL4JkWJkk0N104=; b=av/gNOodFF52i2WtCFrqUwKyaFvE+hp/TJCOQALGHFI9Kb/rxQYElQ+e9058qRaekWAZYHGoNTEpLQ529Oehb+c/h34e+J0kITdbULjnyLTaoixWy7QejyDEx9M29uwTjc1E3sslyO6eM56wVV5QRtlkq/T7WzQVkTf+AT3z76E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648476812666823.0999838194159; Mon, 28 Mar 2022 07:13:32 -0700 (PDT) Received: from localhost ([::1]:50124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq7e-0007xs-2p for importer@patchew.org; Mon, 28 Mar 2022 10:13:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxL-0001kG-2r for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxG-0004jv-Aa for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:50 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-30-TtFVqqQ6PEesStwn8aReow-1; Mon, 28 Mar 2022 10:02:42 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB77A2805529; Mon, 28 Mar 2022 14:02:41 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3A5D1121322; Mon, 28 Mar 2022 14:02:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648476165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vUKEhOLmQYygLsYrpMsrIXKdNdC6DWL4JkWJkk0N104=; b=RBZXlH2cCYy2TiNQKDaZPPfMRhGVAo/TP682hZ8W9nikh6L7zOOKEWeufp0ihnA5Nc+M39 qvgESYmbhl/BXxEEY4ElxHBpxGAEVZQJen8eOrSj7Sf2g7OJ8kVrIsZ/FQSKB37m0gAxBR +0Gf6gafim3ASzsGoX1lo80UqgtyxnQ= X-MC-Unique: TtFVqqQ6PEesStwn8aReow-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/15] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak Date: Mon, 28 Mar 2022 10:02:34 -0400 Message-Id: <20220328140240.40798-10-pbonzini@redhat.com> In-Reply-To: <20220328140240.40798-1-pbonzini@redhat.com> References: <20220328140240.40798-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1648476814848100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Just check the target name instead. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 0162b2f6c4..b09956c14d 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.31.1