From patchwork Mon Apr 20 13:34:55 2020 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: 185579 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp3985455ilf; Mon, 20 Apr 2020 06:44:34 -0700 (PDT) X-Google-Smtp-Source: APiQypIDMB1gpJqhymVYsmg+MblibJPsbNwDomqVvvfsfL2BV36Xz5jRU7nnkNrHD6nzbljVplIr X-Received: by 2002:a0c:fa81:: with SMTP id o1mr4825870qvn.52.1587390274764; Mon, 20 Apr 2020 06:44:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587390274; cv=none; d=google.com; s=arc-20160816; b=SnxkPlbP9eSgYw8XmvLkZOvk/Mz82tJrVKCzhB0I2zYCzHeVfucDEYtnPTqFS6iUUz UqyHBqeiKsAIZSQPx06zW3JmFeNbnbrMlqZwtdyRDfjiLo3qzHuM8UQpRph8P7MMj0at gHm96XfExHHWERo5kfA0L7IPQ7EZqMdTXKq3yDu0XkchlVNpapsF3qLgHz12+l7gYc8+ Rxcr6JkAsL0KY5rN1dJN4+Vn+SMNhGeDIMjis3aqmNR6reVs3f+l4rK9d2g5hVEbDLQE e+n/mbsP3ZsO6MWclo1zD0Oh0vGZd0uk8sRKdcY7vmTWBeNj8pte8+kCzh5I2p+qiDzR FNfg== 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:message-id:date:subject:to:from:dkim-signature; bh=t5aCOcvr56XHS9qZa9KjXvG7frU1XUx0WSgEKCSykPw=; b=JzV+HOLtFGyuI/Hrg742V/t4MuiT0eyrSLqCVf6ID4B+CR23z3xAzWtlWUrWGarPOX MFiPAQacwQwuwY6qTcKaQhOWH23pi3zogPvzdMQPQ4IygAG6T9r47vhfOQYLHpl7oEHh 7GumG+r4TLsYawbA9626+zazPnP6PMNcsFHsZmrAX2YkDiRNee3ntthhJB+y5sBFVS3a szm+5ojLlYzob8HupJgAgneKZVLtEHmKdPb2K6LY1RJOdB/8+ImNquf81nF1jhVw+eWA Te3Cb+amRfurpM3h7EilzrOMs9ZhtpurmPNy984vhkeApz/B+AjXF3zUb1JrAdasz8bz kWtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Txh+1q5y; 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 o16si569866qtk.370.2020.04.20.06.44.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Apr 2020 06:44:34 -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=Txh+1q5y; 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]:35958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQWiw-00065D-8T for patch@linaro.org; Mon, 20 Apr 2020 09:44:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33184 helo=eggs1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQWZk-0007Pv-93 for qemu-devel@nongnu.org; Mon, 20 Apr 2020 09:35:05 -0400 Received: from Debian-exim by eggs1p.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQWZj-0000PL-Kz for qemu-devel@nongnu.org; Mon, 20 Apr 2020 09:35:04 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:42199) by eggs1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQWZj-0000Ls-0C for qemu-devel@nongnu.org; Mon, 20 Apr 2020 09:35:03 -0400 Received: by mail-wr1-x430.google.com with SMTP id j2so12165452wrs.9 for ; Mon, 20 Apr 2020 06:35:02 -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:mime-version :content-transfer-encoding; bh=t5aCOcvr56XHS9qZa9KjXvG7frU1XUx0WSgEKCSykPw=; b=Txh+1q5y0xEa3jIbOpuCP7C4St3cxe2BD5svaKLjQaJLuR0yJCJa+8fXPkv5W5PNaC LgMUOCMenq5bHy/fKX3AhWEhV1IUctaprhyRooJyj6p34fi1QXKxFc+mN9asJggLmeXp tD2f5SCj9c3rIQVRu+8ApW42esfvHNKBOFCAM6/YZf7LaVMf8t1TH4SacEBLUnYaFeRC YRmaB1Gg1fa9eHuo7rO5Z6SlMsx634vhEzANngoekwJFCORcV+Cka6VvoNqHHzSpnBHS L+/xlgzDd7rOG0ODUUhPUx5+EqDM1nUJO6v6BvTCgtRZBvozh3Ig2Hla0qYM9JVXnUjk 1+vw== 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:mime-version :content-transfer-encoding; bh=t5aCOcvr56XHS9qZa9KjXvG7frU1XUx0WSgEKCSykPw=; b=YUZjNS5zsl6DiZKryZ/czvdMj9eicztaqjSn8TT4qUYafRsWjQOPud4/SLeenV+vwd 5SzjdnySq9n6Kw7CXbtR6q0yXbQ+Geh9K/4s2aeuIeH34td8LvY0PhpflBfhhRSSqN2I hwJyNRE6ccEbSh4fGLXYUJUfqlufSS+l+8haV24XqqfOMPl372k3YXMgUmz1lVSOEsDw en7unWI8JzqX6pfXnnaa2M5EVjhuTDBexNBTT5FGXqFkdBXmZ6tErHQczSSGeuN8sAVb HWl//SDNGd8MldhQkzsxJy482IKyiqSECaVPDHYQbfd8JB4kzymHZr/IzNBC29XX/Sm6 P8vA== X-Gm-Message-State: AGi0PuYtUA7cMnHg8qC02q93awgWuz8jdZ8WQrVq+Q/w5iC+eW8Ez4Kz VM2Ox3zoD72VHm/uQp4cBKBRbg== X-Received: by 2002:adf:bc05:: with SMTP id s5mr18468026wrg.70.1587389701466; Mon, 20 Apr 2020 06:35:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j4sm1161155wrm.85.2020.04.20.06.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 06:35:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F14481FF7E; Mon, 20 Apr 2020 14:34:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH] tests/tcg: use EXTRA_RUNS to run gdbtests Date: Mon, 20 Apr 2020 14:34:55 +0100 Message-Id: <20200420133455.25401-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-detected-operating-system: by eggs1p.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::430 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: =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:ARM TCG CPUs" , richard.henderson@linaro.org, "Edgar E. Iglesias" , Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" With --enable-plugins the gdb tests confuse things somewhat as the plugin code attempts to enumerate tests with non-existent binaries. Fortunately we already have a mechanism for these extra tests that don't automatically include their own binaries. Use that mechanism and drop the unneeded .PHONY declarations. Signed-off-by: Alex Bennée --- tests/tcg/aarch64/Makefile.target | 5 ++--- tests/tcg/cris/Makefile.target | 1 + tests/tcg/multiarch/Makefile.target | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) -- 2.20.1 Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index d99b2a9eced..312f36cde5f 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -54,9 +54,6 @@ sve-ioctls: CFLAGS+=-march=armv8.1-a+sve ifneq ($(HAVE_GDB_BIN),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py -AARCH64_TESTS += gdbstub-sysregs gdbstub-sve-ioctls - -.PHONY: gdbstub-sysregs gdbstub-sve-ioctls run-gdbstub-sysregs: sysregs $(call run-test, $@, $(GDB_SCRIPT) \ --gdb $(HAVE_GDB_BIN) \ @@ -70,6 +67,8 @@ run-gdbstub-sve-ioctls: sve-ioctls --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(AARCH64_SRC)/gdbstub/test-sve-ioctl.py, \ "basic gdbstub SVE ZLEN support") + +EXTRA_RUNS += run-gdbstub-sysregs run-gdbstub-sve-ioctls endif endif diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target index 24c7f2e7616..e72d3cbdb23 100644 --- a/tests/tcg/cris/Makefile.target +++ b/tests/tcg/cris/Makefile.target @@ -23,6 +23,7 @@ CRIS_RUNS = $(patsubst %, run-%, $(CRIS_USABLE_TESTS)) # override the list of tests, as we can't build the multiarch tests TESTS = $(CRIS_USABLE_TESTS) +EXTRA_RUNS = VPATH = $(CRIS_SRC) AS = $(CC) -x assembler-with-cpp diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 47fd675aba5..51fb75ecfdd 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -45,15 +45,14 @@ run-test-mmap-%: test-mmap ifneq ($(HAVE_GDB_BIN),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py -MULTIARCH_TESTS += gdbstub-sha1 - -.PHONY: gdbstub-sha1 run-gdbstub-sha1: sha1 $(call run-test, $@, $(GDB_SCRIPT) \ --gdb $(HAVE_GDB_BIN) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/sha1.py, \ "basic gdbstub support") + +EXTRA_RUNS += run-gdbstub-sha1 endif