From 939193a1a1a32be63da48bb8acd7d689ced3eb98 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 6 Dec 2018 15:49:27 +0100 Subject: [PATCH] SCRIPTS/REGTEST: merge grep+sed into sed in run-regtests Some commands chain grep and sed while sed already does grep by default, let's simply use sed. In addition to being more intuitive, it saves up to 150ms per run on the 13 tests covered by level 4. --- scripts/run-regtests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh index d05d8deb3..3034e3630 100755 --- a/scripts/run-regtests.sh +++ b/scripts/run-regtests.sh @@ -66,10 +66,10 @@ _findtests() { for i in $( find "$1" -name "$EXPR" ); do skiptest= - require_version="$(grep "#REQUIRE_VERSION=" "$i" | sed -e 's/.*=//')" - require_version_below="$(grep "#REQUIRE_VERSION_BELOW=" "$i" | sed -e 's/.*=//')" - require_options="$(grep "#REQUIRE_OPTIONS=" "$i" | sed -e 's/.*=//')" - exclude_targets=",$(grep "#EXCLUDE_TARGETS=" "$i" | sed -e 's/.*=//')," + require_version="$(sed -ne 's/^#REQUIRE_VERSION=//p' "$i")" + require_version_below="$(sed -ne 's/^#REQUIRE_VERSION_BELOW=//p' "$i")" + require_options="$(sed -ne 's/^#REQUIRE_OPTIONS=//p' "$i")" + exclude_targets=",$(sed -ne 's/^#EXCLUDE_TARGETS=//p' "$i")," if [ -n "$require_version" ]; then if [ $(_version "$HAPROXY_VERSION") -lt $(_version "$require_version") ]; then