From patchwork Tue Apr 19 09:10:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 563324 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp3109185map; Tue, 19 Apr 2022 02:44:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxviorPFqEMc6ogdMbn5FsMPlze8WpZOWIn1SA29zUdP5Nk1TxOR97Q8bpUzBd5FG4cAwH X-Received: by 2002:a05:620a:3727:b0:69e:606d:b05f with SMTP id de39-20020a05620a372700b0069e606db05fmr8751789qkb.767.1650361441014; Tue, 19 Apr 2022 02:44:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650361441; cv=none; d=google.com; s=arc-20160816; b=Q0LwK7dioSHRFRFRes6+sUYpDNSjJheRDVrJLloMI82XS40ruaOZG0aZRgo+bbcG92 eSdpRgI2lz5kPOilH9huG6Yz2I1iPPohWAFDXFnIB+2uE0vNH0jxWBrCvVY4ITQyNqOs ORDIalGmJq2OzEo1uAW0WwbJpvJWlXGd7k5b+eJ3Za4q0M4FqhPJrjF3nKT0GWYWuZqd Up1Srk9K7cYCt52wBVgdxLiDooOLDQalpYRqFbmzn8RHardELzCwOkP8AfaRM0AG2W6i I8mY/5WfejVLIiWHAwqU+L7s8QgPrnXAqv+HPkDdTnpGNw8pSW2UMwuV/jOeDkMUIFDx EFKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SKBn7TAAlntoysJx3Eu5dxtcs/hYSUSflfkP5bBE/3M=; b=knWvmlZFVBwGLF/JCUihTMIxjTB+Xw0M770Hng2hhJGJtrrTXSTSxMIIGVAn50X4cx B28ztZlmsZ8ldzTMkvBqDNyt0YQOB8ItcojNv46HzD1a7JcudvqkjZH164pQJKF9+kzs KiTFsjqy2CCh/fpT1dz/ET5PUDD3bMzbd+R7D/nDgLIXVZBghUXcs/n73ZxuE04QRL+j ERwSVk1nCo9mGJt68lmry3T41PteZHNbXQQ+mR3U1Xq96xLvXmzwTvteQ0VT1+3WF8Mg Iy9l0CHNPHRbf+SjluKWJiBVJJhpQvcqYoR/LI9QkdhBytk2xqpE1fN0EaQv2GmAzIBg uuOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HutMYUt8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h13-20020a05620a284d00b0069e5ce8c64fsi3502286qkp.96.2022.04.19.02.44.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Apr 2022 02:44:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HutMYUt8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngkOu-0005Oj-FI for patch@linaro.org; Tue, 19 Apr 2022 05:44:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngjsp-0005XO-7R for qemu-devel@nongnu.org; Tue, 19 Apr 2022 05:10:52 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:35815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ngjsm-0008Sx-8v for qemu-devel@nongnu.org; Tue, 19 Apr 2022 05:10:50 -0400 Received: by mail-ej1-x62c.google.com with SMTP id l7so31582725ejn.2 for ; Tue, 19 Apr 2022 02:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SKBn7TAAlntoysJx3Eu5dxtcs/hYSUSflfkP5bBE/3M=; b=HutMYUt8/+8pXyHHcDQRXsen9X72xcFWQ6jLAw/htVqIVSKKR/emwaAPeWnGmkpNIK ouXMlAJ5nmaej5ZA6YJTTkSfo0cHxO4VXdwk0wA5a7vgHoxtBhNKOf6tZUbMRvDdqBQl Cg8QE5Av9Y9TpRStzqagJeUBwRxDWmbRyijpN02IOkUCeAVtddMxlkyosA68Z8JL9iGE OvypmFnnpRucKHvtMIF0xGt9/sYo4TGuKk/RhJZLhBKMrBmdP5vYB/eZjUnPln/5/qEO WK+q34InrhO79DXNrogw4iY8qnon/R+4BOrue+ESKzpliQbPySqXkZXsaKM6FtgXQrhR TGuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SKBn7TAAlntoysJx3Eu5dxtcs/hYSUSflfkP5bBE/3M=; b=TZXY7ebeC+CsznZArUmyxTH/yKnLI4/5djSMvxhOyFlNdN/X5EbNRJpHH5aXTmKSsb anioXD8ma5OM22zMM/vm1T/DuvCVu0b1UnyNyoNedhkLnhYwXlv/bR7i1OOUTsOd0g6E DkIpkjQJfym6PMD9URSHCk7mcYkdv4vPL7b6QPraAcbKtHnN4qfIa31qCD1/pAgdu/UP u/4n3cLBE+fZnbKOTGj8YK5HxZ3xoCFiUt6oBUDfqVmmtO6K0w1ovy48oTVdiPOr8Raw 3ER4Ugr5SfsCOToCFe6WpCkNIQePN1pRUtMLF6mGmkD18EDvdNDADS+iMgY/sRPVAz/F /qKg== X-Gm-Message-State: AOAM531IEbcYcpOo4PsiZG1duFemM/eGsFvoNswUVaNrc96WWw1RpByG sDXdcaZr4WhSAniBC1oBo7nL7D5lVWrX7A== X-Received: by 2002:a17:906:7944:b0:6da:b834:2f3e with SMTP id l4-20020a170906794400b006dab8342f3emr12790552ejo.353.1650359443789; Tue, 19 Apr 2022 02:10:43 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id lb26-20020a170907785a00b006ea4d2928e5sm5451364ejc.218.2022.04.19.02.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 02:10:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7E6FD1FFC5; Tue, 19 Apr 2022 10:10:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/25] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak Date: Tue, 19 Apr 2022 10:10:08 +0100 Message-Id: <20220419091020.3008144-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220419091020.3008144-1-alex.bennee@linaro.org> References: <20220419091020.3008144-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: fam@euphon.net, Eduardo Habkost , berrange@redhat.com, Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Just check the target name instead. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220401141326.1244422-11-pbonzini@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- 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=y" >> $config_target_mak - echo "CONFIG_LINUX_USER=y" >> $config_target_mak echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak ;; *-bsd-user) echo "CONFIG_USER_ONLY=y" >> $config_target_mak - echo "CONFIG_BSD_USER=y" >> $config_target_mak echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak ;; *-softmmu) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index dec401e67f..6bba523729 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -10,7 +10,7 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch # Set search path for all sources VPATH += $(MULTIARCH_SRC) MULTIARCH_SRCS = $(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) -ifneq ($(CONFIG_LINUX_USER),) +ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET)) VPATH += $(MULTIARCH_SRC)/linux MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c)) endif diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target index 17cf168f0a..f9fcd31caf 100644 --- a/tests/tcg/x86_64/Makefile.target +++ b/tests/tcg/x86_64/Makefile.target @@ -8,7 +8,7 @@ include $(SRC_PATH)/tests/tcg/i386/Makefile.target -ifneq ($(CONFIG_LINUX_USER),) +ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET)) X86_64_TESTS += vsyscall TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 else