From patchwork Tue Feb 5 11:26:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 1036651 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sipsolutions.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iFElv5L6"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43v2NX55Xzz9s4V for ; Tue, 5 Feb 2019 22:27:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=TjLQKwBs1Es5qPlVNQ885nnSTslIfeQHnVx1atiHkBw=; b=iFE lv5L6Z2nmdl5O3x4BuxfnRQAJ39kM1oiLTijpTUodzyWaxyPFk/J6Dzj0etxk3y7Pn2xOM1B7uEVs PdZMvVrYi3kYwflFuqFibah9wKubq9P8ZVwcuAG0mZgOZz9CkvRHf4YaFDEkCH8AKkDnbzZmeZ/62 I+e4aWuCZMtkfzcNnYboa5JOMRDSyzfPwd/8m2G5+Bais8o9enQj1JvhlkSWbpwLc4eACxQheXuG1 AmygGRCqO7WFy/0JqjH3BOoJDEw7kfHwOGGFjUWVEYpZTOysyUHk9h8oTI4h5iLdp4Cllfk4zWnUj RmZ3GSPMtUYuUK81H8P/jA9k3VOcluw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gqysW-000050-5U; Tue, 05 Feb 2019 11:27:00 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:191:4433::2] helo=sipsolutions.net) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gqysT-0008WM-CK for hostap@lists.infradead.org; Tue, 05 Feb 2019 11:26:58 +0000 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92-RC4) (envelope-from ) id 1gqysR-0002ZX-Tm; Tue, 05 Feb 2019 12:26:56 +0100 From: Johannes Berg To: hostap@lists.infradead.org Subject: [PATCH v2] tests: hwsim: suppress annoying console reset from VMs Date: Tue, 5 Feb 2019 12:26:46 +0100 Message-Id: <20190205112646.13979-1-johannes@sipsolutions.net> X-Mailer: git-send-email 2.17.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190205_032657_412305_2AFD90C8 X-CRM114-Status: UNSURE ( 8.26 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johannes Berg MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Johannes Berg Recently, qemu/seabios grew an annoying console/terminal reset, which also causes my terminal to be left in a state where long lines don't work well and less gets confused because of this. Suppress this by suppressing all output from qemu before a new magic string printed from inside.sh. Signed-off-by: Johannes Berg --- tests/hwsim/vm/inside.sh | 2 ++ tests/hwsim/vm/vm-run.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/hwsim/vm/inside.sh b/tests/hwsim/vm/inside.sh index ac01d411c3b2..6cb6f76f0d8e 100755 --- a/tests/hwsim/vm/inside.sh +++ b/tests/hwsim/vm/inside.sh @@ -39,6 +39,8 @@ ln -s /proc/self/fd/0 /dev/stdin ln -s /proc/self/fd/1 /dev/stdout ln -s /proc/self/fd/2 /dev/stderr +echo "VM has started up" > /dev/ttyS0 + # create dummy sudo - everything runs as uid 0 mkdir /tmp/bin cat > /tmp/bin/sudo << EOF diff --git a/tests/hwsim/vm/vm-run.sh b/tests/hwsim/vm/vm-run.sh index 1712ed349647..2972fb1b0786 100755 --- a/tests/hwsim/vm/vm-run.sh +++ b/tests/hwsim/vm/vm-run.sh @@ -134,7 +134,8 @@ $KVM \ -fsdev local,security_model=none,id=fsdev-logs,path="$LOGDIR",writeout=immediate \ -device virtio-9p-pci,id=fs-logs,fsdev=fsdev-logs,mount_tag=logshare \ -monitor null -serial stdio -serial file:$LOGDIR/console \ - -append "mac80211_hwsim.support_p2p_device=0 mac80211_hwsim.channels=$CHANNELS mac80211_hwsim.radios=7 cfg80211.dyndbg=+p mac80211.dyndbg=+p mac80211_hwsim.dyndbg=+p init=$CMD testdir=$TESTDIR timewarp=$TIMEWARP console=$KVMOUT root=/dev/root rootflags=trans=virtio,version=9p2000.u ro rootfstype=9p EPATH=$EPATH ARGS=$argsfile" + -append "mac80211_hwsim.support_p2p_device=0 mac80211_hwsim.channels=$CHANNELS mac80211_hwsim.radios=7 cfg80211.dyndbg=+p mac80211.dyndbg=+p mac80211_hwsim.dyndbg=+p init=$CMD testdir=$TESTDIR timewarp=$TIMEWARP console=$KVMOUT root=/dev/root rootflags=trans=virtio,version=9p2000.u ro rootfstype=9p EPATH=$EPATH ARGS=$argsfile" | \ + sed -u '0,/VM has started up/d' if [ $CODECOV = "yes" ]; then echo "Preparing code coverage reports"