From patchwork Wed Oct 19 23:02:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 5922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp575975wrs; Wed, 19 Oct 2022 16:03:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6P1sr0TCXV7iItLOV3xvbXCq2JHysp+L8zw8H1FtHA8QZNJsM548cYKxxssGZ9i+MLBJQt X-Received: by 2002:a05:6402:368:b0:458:9b5e:fd35 with SMTP id s8-20020a056402036800b004589b5efd35mr9872422edw.141.1666220638808; Wed, 19 Oct 2022 16:03:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666220638; cv=none; d=google.com; s=arc-20160816; b=S7Wm6ZAsuYuSBGLdrgG9/n5fO5Z+l7am8oO0yEQoaGOX3b2h8+1QvBNz9vbaHxhCcv n7BH/XD6p3abai3NwNu1/6QgbXVNOQ01fk9uGP/9VfeEVYMndAv2l3YWHCgpeymxMw/v RIBB07G+YvsRKdJ2GELSXHzDqy0yX0g3SoqQ4cxuinlIa710HSsgaym0eJXfBpiiERNx Wa/PPaKgVMZSs5BRD2++UG/iME9ar8+ln6v/olHrfy0+Wkhzxa1B4G+pPwp+MBVzzQs9 pYP3LPL69q9m1ds6M7r7I+uBPUSJwTENzGS5+GKvcmEDz+SYCWcqMFapMFhJxXhyB/S9 sY9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WozfcuVKHz0rPjF7yN9YVygr0CVGKFRMGte0GNTOJSk=; b=ENHxjeVVik1X2pRLPf5W8gxma5Y/5ukEDAD7gEi1ajSH1o8rZDJi/ZsLJQbEYusvPo 9SwaLj2e4NESGkpx7P84Tgzx+f8KG5KI5nxgGK1apd+HoHj+PK5LZWIVPzZo3BE3Q1+G o7TVqcKjMhVJY+XeuIw0vRTGcbRue9Lx5qANqpp6Eec9ZXhCDpY8NpM7Rn1IY7gv+aAs N0yZCg2/HvPFDrEnSYwyfczL43ywwJqJvwPxzW0Itg2+ezdVNU4NSglNO2s9WdYKpKu0 yRJhQZyZg1KCvPpaqW/CvWBsR9ZRQ5cczhbu+sEOCjxbcgFpe+G8nrAPeWJYkEQGFQU3 1UkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DU1xdPkb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d11-20020a50ea8b000000b0045cca8f9a1fsi7022624edo.558.2022.10.19.16.03.31; Wed, 19 Oct 2022 16:03:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DU1xdPkb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231572AbiJSXDF (ORCPT + 99 others); Wed, 19 Oct 2022 19:03:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231449AbiJSXCk (ORCPT ); Wed, 19 Oct 2022 19:02:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6D7CAF1B5; Wed, 19 Oct 2022 16:02:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6EFEBB8261C; Wed, 19 Oct 2022 23:02:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37ECCC433D7; Wed, 19 Oct 2022 23:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666220528; bh=vujWVns8niceU8J6GOrbe2hSQ2hT3dNgCY4sagFnfUw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DU1xdPkbmR2GUqEvEQdWc9lp1hJK1Wr+PgNK9PsFWosORJsgXkNWa+ITbm5esP9mv wXSPbrll5KmoM7exU8I7axoKSu+V5prGkjb+o9GAY8tvj4XONp3xhvcQTtfasgRMkk BQBMGjhXTxdHH8bpbBi2g+00U58ynlWk4O2723Ly1po3MTf7dxW7olZqdV6rJQJfcw uqXjx6DMjG3M43Tu6wSGm68eeTmlvK+t8vQHLQQ6Wy8LBz9CLhOCneDoj4+ebW0XZD SAvF8bFCH1PgR+fFBlBO1EdFqsEE/JOum6BLp81KdroaHUobYSOHnDlp02pxr0QO9J pBj7j/2KnLtHw== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id EC4B15C0890; Wed, 19 Oct 2022 16:02:07 -0700 (PDT) From: "Paul E. McKenney" To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, rostedt@goodmis.org, "Paul E. McKenney" Subject: [PATCH v3 rcu 3/8] rcutorture: Make kvm-test-1-run-qemu.sh check for alternative output Date: Wed, 19 Oct 2022 16:02:01 -0700 Message-Id: <20221019230206.2501794-3-paulmck@kernel.org> X-Mailer: git-send-email 2.31.1.189.g2e36527f23 In-Reply-To: <20221019230203.GA2501612@paulmck-ThinkPad-P17-Gen-1> References: <20221019230203.GA2501612@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747158972507291404?= X-GMAIL-MSGID: =?utf-8?q?1747158972507291404?= The kvm-again.sh script, when running locally, can place the QEMU output into kvm-test-1-run-qemu.sh.out instead of kvm-test-1-run.sh.out. This commit therefore makes kvm-test-1-run-qemu.sh check both locations. Signed-off-by: Paul E. McKenney --- tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh index 9da86e6cd1812..76f24cd5825be 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh @@ -108,7 +108,7 @@ do if test $kruntime -lt $seconds then echo Completed in $kruntime vs. $seconds >> $resdir/Warnings 2>&1 - grep "^(qemu) qemu:" $resdir/kvm-test-1-run.sh.out >> $resdir/Warnings 2>&1 + grep "^(qemu) qemu:" $resdir/kvm-test-1-run*.sh.out >> $resdir/Warnings 2>&1 killpid="`sed -n "s/^(qemu) qemu: terminating on signal [0-9]* from pid \([0-9]*\).*$/\1/p" $resdir/Warnings`" if test -n "$killpid" then