From: Willy Tarreau <w@1wt.eu>
Date: Thu, 6 Dec 2018 14:49:27 +0000 (+0100)
Subject: SCRIPTS/REGTEST: merge grep+sed into sed in run-regtests
X-Git-Tag: v1.9-dev10~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=939193a1a1a32be63da48bb8acd7d689ced3eb98;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index d05d8deb37..3034e36303 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