From patchwork Tue Aug 3 11:02:37 2021 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: 490897 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp535503jap; Tue, 3 Aug 2021 04:03:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhVirB1BaIQTce3/+Ka+Wrpxj+1jv8kAFo3jqHcunFJBYyT3nx9+HRQk0iqDCZ3DjA6hhr X-Received: by 2002:aa7:d6cd:: with SMTP id x13mr24819755edr.300.1627988582771; Tue, 03 Aug 2021 04:03:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627988582; cv=none; d=google.com; s=arc-20160816; b=KWY02i6XlvF4Va3shePQnShUunWa+UZbywhgR3clZDIc4X8KnU4bhPJZuXImQn0+JY s/h+KLOwSMkjKxFKJYARxH+ahjOon6n2AckAdtYHVzcMncY0ykHlziGqYqoF3CwpYDvp 8GESR28IzsEnts89PZehTdR6WsF96U1s5ojO9fNm2Q1CfTC1JJxceU9/EHCBypJqUy2u HhfNp1rUvyJo1wTDtPjotGihLK30oqbENr7xjEDLg5FYVLWZFRhTg4iBOzJ586sdNM+h Tly7fSNxOhYUslG+HpU+M7NkX/pkeinBMwfrek9AeJXctBkkYMfp7L6lNM9j24NmARrN Wsbw== 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=FcmgASapL/jbxLLz2AgS1gw0FxDPEQ4usRRpydHEWTk=; b=xqbvOB0r0LpBKpCd6b+0C3yLInaABLTu7+MikFq0+7Uos+BZwi99UmahVQTZfs+YWh dfLI/kK8uPrqmI1K9WcZQ4EEdBXntXDSL2o2oTsX8RIhikWaWFNEheJEsOOk5VOZw/Kn SOu0vH6KUTvsYMcOVLxRi7QkUjCCQtKDFbjp15q1wBNDBuW8gmFLUW+i+rLPeRCVzbfw fw/z08FMmUg5iQZNlkWykKZKsbfVsskJnft3Sb+KT0S+JiXUpYVQOgfOXobuGqHTfoMg 8iGJCF2PndaGjIo/6nZwzLEQFIRmevp67Ua+neOkN2Ql5/c9krrGewQhB753+A1AT9Nd u9jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iiVWvc6+; 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 v4si12567147ejf.180.2021.08.03.04.03.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Aug 2021 04:03:02 -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=iiVWvc6+; 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]:53262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAsCL-0005p8-PX for patch@linaro.org; Tue, 03 Aug 2021 07:03:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAsC8-0005kx-ES for qemu-devel@nongnu.org; Tue, 03 Aug 2021 07:02:48 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:36684) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAsC6-0003k6-Sk for qemu-devel@nongnu.org; Tue, 03 Aug 2021 07:02:48 -0400 Received: by mail-wm1-x331.google.com with SMTP id o7-20020a05600c5107b0290257f956e02dso1457715wms.1 for ; Tue, 03 Aug 2021 04:02:46 -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=FcmgASapL/jbxLLz2AgS1gw0FxDPEQ4usRRpydHEWTk=; b=iiVWvc6+L5+EUOonWuRJgC8i6DMfgFN8I4VZO7EmLAeGqa/kHgjUitfg6SMezE20h+ o7Z8LzAkDyJESxLZIeekv76nplSVN0wlVswg1bx0Nfau9VdVEnxyCHrDd9wrPFww5qTC spZhWpp3yQeOcT6WSIxbCdcAt2piFcUZB9JEKn4qC7N+VNWLgCn3VniLDRurm9aZEGF/ 2YqiHrlvJTMkXvriRfjL3cYAnE6dCwQWkRxyAEjWjwGvK6YbIgBHh7uipMAmkQDfXgdQ E2cU/RWHvsPDeeMyO5A2Pwp3gfvWpqCLjJ5BnE5c96W5A3Wxe18OrDnno083J8h0OWP3 QOzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FcmgASapL/jbxLLz2AgS1gw0FxDPEQ4usRRpydHEWTk=; b=eyYQwiKWvjWWCyOfz1eVj7PxMHHtVTHkuEitlC2lCnOhhWJ+ztnMzRQ/cehlATIiMy ee5NkA+xC5Tucm8nT8+8WQnIFC71ZEGFGC4QJs5CIXL75CCxiHl7scyHTbTOcLrMmld5 N1Rmbyb/cP8ggFq3zjwIxowpM4V07EDzBPwXm9Wz4R5HjLha99M3HmQCxAZPNrVwQrl1 rLC+z0kU2Ad0Av+B++UzEAgnZRW8quvHd36vC0SRnlyxyNd21bsP6oTd09J9eDjyXbXO NqR/pW/VxJ5W2u+D6htqTWD8qf/DgxBdiipLr9mGVJ85Rzbuy0FXAacOzoU9hGyPWvh1 JZMQ== X-Gm-Message-State: AOAM532nvJY69CZk+SqmmOdwFWmloqXtbO3l9nTLPcBP248Q36u/GKZT YSlR0ZuT0p1SYL+ArsPRFRUPjw== X-Received: by 2002:a7b:c5d2:: with SMTP id n18mr3720093wmk.97.1627988565546; Tue, 03 Aug 2021 04:02:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p4sm13633059wre.83.2021.08.03.04.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 04:02:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 17C401FF9A; Tue, 3 Aug 2021 12:02:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 3/3] tests/tcg: commit Makefile atrocities in the name of portability Date: Tue, 3 Aug 2021 12:02:37 +0100 Message-Id: <20210803110237.1051032-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210803110237.1051032-1-alex.bennee@linaro.org> References: <20210803110237.1051032-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Eduardo Habkost , Richard Henderson , f4bug@amsat.org, imp@bsdimp.com, 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" Not all of the multiarch tests are pure POSIX so elide over those tests on a non-Linux system. This allows for at least some of the tests to be nominally usable by *BSD user builds. Signed-off-by: Alex Bennée Cc: Warner Losh --- tests/tcg/multiarch/Makefile.target | 6 +++++- tests/tcg/x86_64/Makefile.target | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.30.2 Acked-by: Warner Losh Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 85a6fb7a2e..38ee0f1dec 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -10,7 +10,11 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch # Set search path for all sources VPATH += $(MULTIARCH_SRC) MULTIARCH_SRCS =$(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) -MULTIARCH_TESTS =$(filter-out float_helpers, $(MULTIARCH_SRCS:.c=)) +MULTIARCH_SKIP=float_helpers +ifeq ($(CONFIG_LINUX),) +MULTIARCH_SKIP+=linux-test +endif +MULTIARCH_TESTS =$(filter-out $(MULTIARCH_SKIP),$(MULTIARCH_SRCS:.c=)) # # The following are any additional rules needed to build things diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target index 2151ea6302..d7a7385583 100644 --- a/tests/tcg/x86_64/Makefile.target +++ b/tests/tcg/x86_64/Makefile.target @@ -8,8 +8,12 @@ include $(SRC_PATH)/tests/tcg/i386/Makefile.target +ifneq ($(CONFIG_LINUX),) X86_64_TESTS += vsyscall TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 +else +TESTS=$(MULTIARCH_TESTS) +endif QEMU_OPTS += -cpu max test-x86_64: LDFLAGS+=-lm -lc