[bpf-next,v2,01/16] selftests: xsk: remove color mode

Message ID	20210817092729.433-2-magnus.karlsson@gmail.com
State	New
Headers	show Return-Path: <netdev-owner@kernel.org> From: Magnus Karlsson <magnus.karlsson@gmail.com> To: magnus.karlsson@intel.com, bjorn@kernel.org, ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org, maciej.fijalkowski@intel.com Cc: jonathan.lemon@gmail.com, ciara.loftus@intel.com, bpf@vger.kernel.org, yhs@fb.com, andrii@kernel.org Subject: [PATCH bpf-next v2 01/16] selftests: xsk: remove color mode Date: Tue, 17 Aug 2021 11:27:14 +0200 Message-Id: <20210817092729.433-2-magnus.karlsson@gmail.com> In-Reply-To: <20210817092729.433-1-magnus.karlsson@gmail.com> References: <20210817092729.433-1-magnus.karlsson@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	selftests: xsk: various simplifications \| expand [bpf-next,v2,00/16] selftests: xsk: various simplifications [bpf-next,v2,01/16] selftests: xsk: remove color mode [bpf-next,v2,02/16] selftests: xsk: remove the num_tx_packets option [bpf-next,v2,03/16] selftests: xsk: remove unused variables [bpf-next,v2,04/16] selftests: xsk: return correct error codes [bpf-next,v2,05/16] selftests: xsk: simplify the retry code [bpf-next,v2,06/16] selftests: xsk: remove end-of-test packet [bpf-next,v2,07/16] selftests: xsk: disassociate umem size with packets sent [bpf-next,v2,08/16] selftests: xsk: rename worker_* functions that are not thread entry points [bpf-next,v2,09/16] selftests: xsk: simplify packet validation in xsk tests [bpf-next,v2,10/16] selftests: xsk: validate tx stats on tx thread [bpf-next,v2,11/16] selftests: xsk: decrease batch size [bpf-next,v2,12/16] selftests: xsk: remove cleanup at end of program [bpf-next,v2,13/16] selftests: xsk: generate packet directly in umem [bpf-next,v2,14/16] selftests: xsk: generate packets from specification [bpf-next,v2,15/16] selftests: xsk: make enums lower case [bpf-next,v2,16/16] selftests: xsk: preface options with opt

Message ID

20210817092729.433-2-magnus.karlsson@gmail.com

State

New

Headers

From: Magnus Karlsson <magnus.karlsson@gmail.com>
To: magnus.karlsson@intel.com, bjorn@kernel.org, ast@kernel.org,
	daniel@iogearbox.net, netdev@vger.kernel.org,
	maciej.fijalkowski@intel.com
Cc: jonathan.lemon@gmail.com, ciara.loftus@intel.com,
	bpf@vger.kernel.org, yhs@fb.com, andrii@kernel.org
Subject: [PATCH bpf-next v2 01/16] selftests: xsk: remove color mode
Date: Tue, 17 Aug 2021 11:27:14 +0200
Message-Id: <20210817092729.433-2-magnus.karlsson@gmail.com>
In-Reply-To: <20210817092729.433-1-magnus.karlsson@gmail.com>
References: <20210817092729.433-1-magnus.karlsson@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

selftests: xsk: various simplifications | expand

Commit Message

Magnus Karlsson Aug. 17, 2021, 9:27 a.m. UTC

From: Magnus Karlsson <magnus.karlsson@intel.com>

Remove color mode since it does not add any value and having less code
means less maintenance which is a good thing.

Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
---
 tools/testing/selftests/bpf/test_xsk.sh    | 10 +++-----
 tools/testing/selftests/bpf/xsk_prereqs.sh | 27 +++++-----------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh
index 46633a3bfb0b..cd7bf32e6a17 100755
--- a/tools/testing/selftests/bpf/test_xsk.sh
+++ b/tools/testing/selftests/bpf/test_xsk.sh
@@ -63,14 +63,11 @@ 
 # ----------------
 # Must run with CAP_NET_ADMIN capability.
 #
-# Run (full color-coded output):
-#   sudo ./test_xsk.sh -c
+# Run:
+#   sudo ./test_xsk.sh
 #
 # If running from kselftests:
-#   sudo make colorconsole=1 run_tests
-#
-# Run (full output without color-coding):
-#   sudo ./test_xsk.sh
+#   sudo make run_tests
 #
 # Run with verbose output:
 #   sudo ./test_xsk.sh -v
@@ -83,7 +80,6 @@ 
 while getopts "cvD" flag
 do
 	case "${flag}" in
-		c) colorconsole=1;;
 		v) verbose=1;;
 		D) dump_pkts=1;;
 	esac
diff --git a/tools/testing/selftests/bpf/xsk_prereqs.sh b/tools/testing/selftests/bpf/xsk_prereqs.sh
index dac1c5f78752..8fe022a4dbfa 100755
--- a/tools/testing/selftests/bpf/xsk_prereqs.sh
+++ b/tools/testing/selftests/bpf/xsk_prereqs.sh
@@ -8,11 +8,6 @@  ksft_xfail=2
 ksft_xpass=3
 ksft_skip=4
 
-GREEN='\033[0;92m'
-YELLOW='\033[0;93m'
-RED='\033[0;31m'
-NC='\033[0m'
-STACK_LIM=131072
 SPECFILE=veth.spec
 XSKOBJ=xdpxceiver
 NUMPKTS=10000
@@ -50,22 +45,12 @@  validate_veth_spec_file()
 test_status()
 {
 	statusval=$1
-	if [ -n "${colorconsole+set}" ]; then
-		if [ $statusval -eq 2 ]; then
-			echo -e "${YELLOW}$2${NC}: [ ${RED}FAIL${NC} ]"
-		elif [ $statusval -eq 1 ]; then
-			echo -e "${YELLOW}$2${NC}: [ ${RED}SKIPPED${NC} ]"
-		elif [ $statusval -eq 0 ]; then
-			echo -e "${YELLOW}$2${NC}: [ ${GREEN}PASS${NC} ]"
-		fi
-	else
-		if [ $statusval -eq 2 ]; then
-			echo -e "$2: [ FAIL ]"
-		elif [ $statusval -eq 1 ]; then
-			echo -e "$2: [ SKIPPED ]"
-		elif [ $statusval -eq 0 ]; then
-			echo -e "$2: [ PASS ]"
-		fi
+	if [ $statusval -eq 2 ]; then
+		echo -e "$2: [ FAIL ]"
+	elif [ $statusval -eq 1 ]; then
+		echo -e "$2: [ SKIPPED ]"
+	elif [ $statusval -eq 0 ]; then
+		echo -e "$2: [ PASS ]"
 	fi
 }

[bpf-next,v2,01/16] selftests: xsk: remove color mode

Commit Message

Patch