From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6FEBD31280A; Wed, 3 Dec 2025 16:03:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777783; cv=none; b=hcJfQERkAAgsQAwr9mdxIXN1FPYZ6rrSHVJFVhvNKFcQEtx2c1BMCp9fVeV9wk+rgH2a9rP4PwIRCj50YQ2H6dvoh3YQFXw5byYdcTJC6LdCoIE7hvxxdp8gegdEfPLGg/jb5AngPx2Q5epiz5eme8n1cacP/ad8umjBzcnJikE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777783; c=relaxed/simple; bh=MUd9di/VpwrPK7Nptnhp9ZF3YrSr5eG8vCx3y0+EmVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QKzmhHLU0wNWuNLuYJ9T75/JDzuGfUrNOwQsYd45Bch2syVyvz3an7gcG8KIR9ByeVK1C7OxzfC9JXd02qruyXa2iFuTDhTxyoP2gOg70Ungyv6NMIFIHR3p4DMam7wnPt303jZ9exoNxheRsGmuO7e3cl7nhHzVzaV0k2njUUU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YgZNSfGv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YgZNSfGv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1451C4CEF5; Wed, 3 Dec 2025 16:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764777783; bh=MUd9di/VpwrPK7Nptnhp9ZF3YrSr5eG8vCx3y0+EmVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YgZNSfGv6JB6JGs97AMqJyJt7wj7ARoqkzZ8EFVIFjCVZK8SA74LEZyQKD7uPhngO bE5DDgmfV6w/MIPa63h0l3G3HyguE8FOoFsgpWtzReDbUqFwaydSkS8Eqin/lOmNhD UmCLWQYnHXxqm7om2w7DEAelI2nQpjn7Zi05aKUs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Petr Machata , David Ahern , Ido Schimmel , Paolo Abeni , Sasha Levin Subject: [PATCH 5.15 146/392] selftests: traceroute: Use require_command() Date: Wed, 3 Dec 2025 16:24:56 +0100 Message-ID: <20251203152419.457710747@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152414.082328008@linuxfoundation.org> References: <20251203152414.082328008@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ido Schimmel [ Upstream commit 47efbac9b768553331b9459743a29861e0acd797 ] Use require_command() so that the test will return SKIP (4) when a required command is not present. Before: # ./traceroute.sh SKIP: Could not run IPV6 test without traceroute6 SKIP: Could not run IPV4 test without traceroute $ echo $? 0 After: # ./traceroute.sh TEST: traceroute6 not installed [SKIP] $ echo $? 4 Reviewed-by: Petr Machata Reviewed-by: David Ahern Signed-off-by: Ido Schimmel Link: https://patch.msgid.link/20250908073238.119240-6-idosch@nvidia.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- tools/testing/selftests/net/traceroute.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/traceroute.sh b/tools/testing/selftests/net/traceroute.sh index de9ca97abc306..9cb5e96e64333 100755 --- a/tools/testing/selftests/net/traceroute.sh +++ b/tools/testing/selftests/net/traceroute.sh @@ -209,11 +209,6 @@ setup_traceroute6() run_traceroute6() { - if [ ! -x "$(command -v traceroute6)" ]; then - echo "SKIP: Could not run IPV6 test without traceroute6" - return - fi - setup_traceroute6 # traceroute6 host-2 from host-1 (expects 2000:102::2) @@ -278,11 +273,6 @@ setup_traceroute() run_traceroute() { - if [ ! -x "$(command -v traceroute)" ]; then - echo "SKIP: Could not run IPV4 test without traceroute" - return - fi - setup_traceroute # traceroute host-2 from host-1 (expects 1.0.1.1). Takes a while. @@ -316,6 +306,9 @@ do esac done +require_command traceroute6 +require_command traceroute + run_tests printf "\nTests passed: %3d\n" ${nsuccess} -- 2.51.0