From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [91.216.245.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C7A629E116 for ; Thu, 9 Jul 2026 20:04:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.216.245.30 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783627465; cv=none; b=BEq8Jv887XN9dykurZXG3RY5WbmtrtKTGLu2BBfqqIGIgwPMUgJWlIh1eowkI6EArgB7pU/UTpCZ5Ry55+VSZI1rFgbAHlCEo6jp1gVdPAm4GUiTUqzbNybfxR9bAg2+5M5YAwyc9OJBqC9pjyXpyWDLmg2u0C4MeCPH8hq4bcc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783627465; c=relaxed/simple; bh=VewEeYr9KKqYj32ANHVqw6NDJZEzpMZ1/YHkVhUzqGo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SiqeaV5FMNbvWGdrlu1ejKidqLjKcjbfkP7iFzuVMvax15QY1Tc6Tmll8uDNlCuEiVCJZREQHC093N8NJzOgzSzmLrXne7STgtS+Mq9HCVCJrVIDcb+Ts2tnR1B6+slah8/QkFFOUNVcD9dgdSbP7OSaQdHN3HP7PFVLroNTNoI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de; spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc; arc=none smtp.client-ip=91.216.245.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc Received: by Chamillionaire.breakpoint.cc (Postfix, from userid 1003) id C0E7C602A9; Thu, 09 Jul 2026 22:04:22 +0200 (CEST) From: Florian Westphal To: Cc: kadlec@netfilter.org, Florian Westphal Subject: [PATCH ipset 4/7] tests: check_klog.sh: unclutter stderr Date: Thu, 9 Jul 2026 22:03:55 +0200 Message-ID: <20260709200358.15504-5-fw@strlen.de> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260709200358.15504-1-fw@strlen.de> References: <20260709200358.15504-1-fw@strlen.de> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit My test vm doesn't have a kern.log file, but the existing script will fall back to dmesg which is good enough for me. Suppress the 'no such file' error from tail and go straight to the dmesg fallback. Signed-off-by: Florian Westphal --- tests/check_klog.sh | 7 ++++++- tests/sendip.sh | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/check_klog.sh b/tests/check_klog.sh index 8ecad3eb987e..bc602be839aa 100755 --- a/tests/check_klog.sh +++ b/tests/check_klog.sh @@ -44,7 +44,12 @@ port=$1; shift set +e for setname in $@; do - match=`tail -n +$loglines /var/log/kern.log | grep -e "in set $setname: .* SRC=$ipaddr .* PROTO=$proto SPT=$port .*"` + if [ -r /var/log/kern.log ]; then + match=`tail -n +$loglines /var/log/kern.log | grep -e "in set $setname: .* SRC=$ipaddr .* PROTO=$proto SPT=$port .*"` + else + match="" + fi + if [ -z "$match" ]; then match=`dmesg | tail -n +$loglines | grep -e "in set $setname: .* SRC=$ipaddr .* PROTO=$proto SPT=$port .*"` fi diff --git a/tests/sendip.sh b/tests/sendip.sh index f80b24ab49b8..d1f8ebe4d75b 100755 --- a/tests/sendip.sh +++ b/tests/sendip.sh @@ -1,6 +1,5 @@ #!/bin/bash # Save lineno for checking -wc -l /var/log/kern.log | cut -d ' ' -f 1 > "$IPSET_TMP/.loglines" +wc -l /var/log/kern.log 2>/dev/null | cut -d ' ' -f 1 > "$IPSET_TMP/.loglines" sendip "$@" - -- 2.54.0