From patchwork Tue Mar 12 17:09:14 2019 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: 160156 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp13375057jad; Tue, 12 Mar 2019 10:38:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqyK06I22sphSbtDJ/sLDHDcCq1nVbUJa1azVzeCa3kx6G4mPfMweWNc0y0BXVwKcjyFJ9j7 X-Received: by 2002:a81:4cc1:: with SMTP id z184mr31741124ywa.142.1552412294379; Tue, 12 Mar 2019 10:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552412294; cv=none; d=google.com; s=arc-20160816; b=NMYVy/Vz8/2jd93Gnp+1ymYsbOVH2aRP+ENds0IAOOItLmuFSOjNAIYbmznbL5ZJFx nvPX/5Q8G/ZNwOQO6eDCjx4gA1m5gN3CTKF/KmpHe+bpoWCh5NG/QmdXmpjLFlw1t2ND Ue08Ph/uRJ21fUcU1okRAzeeitdIHWpWW2K2lYAn4xE8kaNnsl41t4aj7Ujd84IoKsxQ ozCgO0flR0o/2QMRPscWYSAvO4eEc0M6btjqAFqq/MtVQzwO3rEQKzblJmSixHSkR0xI /XeEoUT8cY05ooUg2vNq9xxCpuO1vGt5Dz7Dah6f+dOSR3zDbqRnIrwAKs0gVXJVIy3H 4bfg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=LUyI9swR1g0//2WXnYs78dJtt4zaWN8IC4fzgulLYDg=; b=ek8ha+gCWNZRGAeoiDzbmKnT9bE5hoknFKHTu2hu7L5p1a1arbygDpCQD8T04aQq66 Dwb5O+SU4HUMB7lnnQ3jlJuwmaed2vYPxhkMdVM59bs+u+KkLObeRbLV/WSLGi44zBEz rAh0rJPVxhpoAvs/fnkUqCTkval4CQOIAEvlCvaYtaG5pGg3lxnZQjPagM0fqvQDFqpF UOg81E8hwcypkD0BfzZdDEruuNkZdnLUylCApxBkWLliHyk4J7dEosgJf739m+XoTDzq SBFMQ1gtCEbNhnBNsCNRpGhk95fqWhmgYn4jl/AwJA5u3j9SxclZWIzGY2hQ5xP1+gO+ R0vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=q+TtWgz5; 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 e133si5107407ybb.226.2019.03.12.10.38.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:38:14 -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=q+TtWgz5; 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 ([127.0.0.1]:56538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lLx-0005rb-QY for patch@linaro.org; Tue, 12 Mar 2019 13:38:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2x-0005Wi-Ic for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kuI-0006wc-69 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:38 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kuH-0006vN-Uc for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:09:38 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n19so3508894wmi.1 for ; Tue, 12 Mar 2019 10:09:37 -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=LUyI9swR1g0//2WXnYs78dJtt4zaWN8IC4fzgulLYDg=; b=q+TtWgz5wnzistaZvU/KQZvdIrS7EGEE7zJcY2ZOc3JvBJFBKW0qBgngrIotQhOdxI Uh5p8zlCmTBKlBEMdWDWl7ebhve8JS146/6cdL7vpuCu8KTKVeERE7aR9niH+j9MS+s/ eJ7FXzZgM3oMX8895LPT8LRJRy7PpHpf+FsNsEX4AlZwPivF7Iy1wdnCb3aRXTWC+i3w aCc8oD8oBkJJFUZRCwWYbMUe6e+VeYS3Fn7JQGkVvk+4OHFdr9yvopxwzkrofJdiReOd hEcUbxQQB3S6w32wfqUMdV8km/UjGXhJd3fgQJx/ZI4+Uk1F70126z1sOTrb9DbhJ2+w JDXQ== 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=LUyI9swR1g0//2WXnYs78dJtt4zaWN8IC4fzgulLYDg=; b=AYjyKYvx5u+tZs7HOydq8aFlbNGo48enMZ58dzryg9GLllGfbGdAnqhzV3n0JxcwJN 9hJAYK5zhaGTlHIAZyEawSYg02LwEf3Cn+9XA5DxLb6L7E1zNKfJNnWFQE64UDP9Mot1 KScpNJTIDg4HI+PJIWidbOQr8aiJIxqOvChG9fh9THuJIu8xhjxWk96InY1rbRev92zJ l10pOnNHLt8mKkUai2OLkyqaw5iEeyEGhEvhF7//LZAbVbeBRoLlIpTQF71LuXmZetg9 yaBXh1WZl4Q+ZAl/BrnUV1rrZAc2/YDiQToCcSNsFpYsYm1/APdEglwsx8vihdZmoFJB 3H/w== X-Gm-Message-State: APjAAAXUp/oTEoEXJbUzyYqwKjC+PvJn1P8MDUuC/cWowribP/0Bk7PG QkTZub4RERb4mK6ZqkZQi31lhg== X-Received: by 2002:a1c:7d56:: with SMTP id y83mr2982721wmc.94.1552410576419; Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 132sm3796993wmd.30.2019.03.12.10.09.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:09:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CFF561FF93; Tue, 12 Mar 2019 17:09:31 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:14 +0000 Message-Id: <20190312170931.25013-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f Subject: [Qemu-devel] [PULL 09/26] tests/tcg: split run-test into user and system variants X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can't rely on shell redirect magic to get things right so lets setup a common output chardev that is expecting to write to files. As we have split run-test up we might as well move the default monitor bits into the call. Finally a little make sophistry is required to correctly quote $(COMMA) and as we don't inherit common rules we have our own little copy here. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 454d0a4119..d26a36df61 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -32,10 +32,17 @@ -include ../../config-host.mak -include ../config-target.mak +# for including , in command strings +COMMA := , + quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) # $1 = test name, $2 = cmd, $3 = desc +ifdef CONFIG_USER_ONLY run-test = $(call quiet-command, timeout $(TIMEOUT) $2 > $1.out,"TEST",$3) +else +run-test = $(call quiet-command, timeout $(TIMEOUT) $2,"TEST",$3) +endif # $1 = test name, $2 = reference diff-out = $(call quiet-command, diff -u $1.out $2 | head -n 10,"DIFF","$1.out with $2") @@ -54,11 +61,10 @@ LDFLAGS= # The QEMU for this TARGET ifdef CONFIG_USER_ONLY QEMU=../qemu-$(TARGET_NAME) -QEMU_OPTS= else QEMU=../qemu-system-$(TARGET_NAME) -QEMU_OPTS=-monitor none -display none endif +QEMU_OPTS= # If TCG debugging is enabled things are a lot slower @@ -110,8 +116,17 @@ all: $(TESTS) RUN_TESTS=$(patsubst %,run-%, $(TESTS)) RUN_TESTS+=$(EXTRA_RUNS) +ifdef CONFIG_USER_ONLY run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") +else +run-%: % + $(call run-test, $<, \ + $(QEMU) -monitor none -display none \ + -chardev file$(COMMA)path=$<.out$(COMMA)id=output \ + $(QEMU_OPTS) $<, \ + "$< on $(TARGET_NAME)") +endif .PHONY: run run: $(RUN_TESTS)