From patchwork Fri Nov 12 13:37:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 12616799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAC70C433FE for ; Fri, 12 Nov 2021 13:37:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE3C160F5B for ; Fri, 12 Nov 2021 13:37:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231803AbhKLNkk (ORCPT ); Fri, 12 Nov 2021 08:40:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41725 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231436AbhKLNkj (ORCPT ); Fri, 12 Nov 2021 08:40:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636724268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6cq2Esb5iKdBbRztuK1mvJNAfyvIP7lgfmlaMv3Qpjk=; b=QMpKDLYT8sx6U/dnxCYt7H8j0tul7QJoT70pMLCF8I62x9VMrKCIMl7ngJeDvwqRLavcYx 9VzWrOAR2JAS/50Kjrywud6iuGI89ncRdy+TB0dQXxo+hDgR8IEUlKuNLQ2JK/bziunRO5 c7qAusFL5DnEiQ997GVk4VjP7LjwFso= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-88-LixIfWZmOmCVjR1EynJJlQ-1; Fri, 12 Nov 2021 08:37:45 -0500 X-MC-Unique: LixIfWZmOmCVjR1EynJJlQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B1FFC100C669; Fri, 12 Nov 2021 13:37:44 +0000 (UTC) Received: from gator.redhat.com (unknown [10.40.194.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1082860862; Fri, 12 Nov 2021 13:37:42 +0000 (UTC) From: Andrew Jones To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, thuth@redhat.com, marcorr@google.com, zxwang42@gmail.com Subject: [PATCH kvm-unit-tests 1/2] unittests.cfg: groups should be space separated Date: Fri, 12 Nov 2021 14:37:38 +0100 Message-Id: <20211112133739.103327-2-drjones@redhat.com> In-Reply-To: <20211112133739.103327-1-drjones@redhat.com> References: <20211112133739.103327-1-drjones@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org As specified in the comment blocks at the tops of the unittests.cfg files, multiple groups assigned to 'groups' should be space separated. Currently any nonword character works for the deliminator, but the implementation may change. Stick to the specs. Signed-off-by: Andrew Jones Reviewed-by: Marc Orr --- README.md | 2 +- arm/unittests.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b498aafd1a77..6e6a9d0429bc 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ host. kvm-unit-tests provides two ways to handle tests like those. a) independently, `ARCH-run ARCH/test` b) by specifying any other non-nodefault group it is in, - groups = nodefault,mygroup : `./run_tests.sh -g mygroup` + groups = nodefault mygroup : `./run_tests.sh -g mygroup` c) by specifying all tests should be run, `./run_tests.sh -a` diff --git a/arm/unittests.cfg b/arm/unittests.cfg index f776b66ef96d..945c2d074719 100644 --- a/arm/unittests.cfg +++ b/arm/unittests.cfg @@ -232,7 +232,7 @@ arch = arm64 [micro-bench] file = micro-bench.flat smp = 2 -groups = nodefault,micro-bench +groups = nodefault micro-bench accel = kvm arch = arm64 From patchwork Fri Nov 12 13:37:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 12616801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 298F1C433F5 for ; Fri, 12 Nov 2021 13:37:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0853560F5B for ; Fri, 12 Nov 2021 13:37:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232429AbhKLNkm (ORCPT ); Fri, 12 Nov 2021 08:40:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52171 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231436AbhKLNkl (ORCPT ); Fri, 12 Nov 2021 08:40:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636724271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YU5hfpJqAc3Pn3MPWNMlEEHUbhpJegaxPbnsaOM3Lug=; b=XskL8DJJscVNG+etvHNhlAJy5TAuBO9tt8YEkDWpCiZtJiXoqCA0mXNL7ZoCQ6K3aSR2cP ceTCqetcYVgyKazOi1W9DQGp8fKVeG+2rQm3Brq0wfKv7cM4NeqBYtyv35qwUqTdID8xCa b12J0rQb010d0zV34xt73xvsDKKDHPw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-473-P0JlMuxEM86-9VV5HAQXwg-1; Fri, 12 Nov 2021 08:37:47 -0500 X-MC-Unique: P0JlMuxEM86-9VV5HAQXwg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6519420E4; Fri, 12 Nov 2021 13:37:46 +0000 (UTC) Received: from gator.redhat.com (unknown [10.40.194.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CEB660862; Fri, 12 Nov 2021 13:37:44 +0000 (UTC) From: Andrew Jones To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, thuth@redhat.com, marcorr@google.com, zxwang42@gmail.com Subject: [PATCH kvm-unit-tests 2/2] runtime: Use find_word with groups Date: Fri, 12 Nov 2021 14:37:39 +0100 Message-Id: <20211112133739.103327-3-drjones@redhat.com> In-Reply-To: <20211112133739.103327-1-drjones@redhat.com> References: <20211112133739.103327-1-drjones@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Groups are space separated, so we can remove the 'grep -w', which has caused problems in the past with testnames, see b373304853a0 ("scripts: Fix the check whether testname is in the only_tests list") and use find_word. Signed-off-by: Andrew Jones Reviewed-by: Marc Orr --- scripts/runtime.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runtime.bash b/scripts/runtime.bash index 132389c7dd59..4deb41ca251c 100644 --- a/scripts/runtime.bash +++ b/scripts/runtime.bash @@ -132,7 +132,7 @@ function run() } cmdline=$(get_cmdline $kernel) - if grep -qw "migration" <<<$groups ; then + if find_word "migration" "$groups"; then cmdline="MIGRATION=yes $cmdline" fi if [ "$verbose" = "yes" ]; then