File bsc#1155290-0004-Tests-cts-cli-Use-extended-reg... of Package pacemaker.19778

Overview Repositories Revisions Requests Users Attributes Meta

File bsc#1155290-0004-Tests-cts-cli-Use-extended-regular-expressions-1.1.patch of Package pacemaker.19778

From 9272e85432ec592771729d2eeb45efacf0ef9807 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Fri, 11 Jan 2019 12:27:53 -0500
Subject: [PATCH 4/4] Tests: cts-cli: Use extended regular expressions.

FreeBSD sed requires the use of extended regular expressions to use the
+ operator in a regex.  The -E command line argument turns that on.  GNU
sed also supports this.  Doing so flips the meaning of parens, though.
An unescaped paren is now used for grouping, and an escaped paren is for
a literal paren.
---
 tools/regression.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/regression.sh b/tools/regression.sh
index b517d1b7d..e839105e8 100755
--- a/tools/regression.sh
+++ b/tools/regression.sh
@@ -769,7 +769,8 @@ for t in $tests; do
     echo "Testing $t"
     test_$t > $test_home/regression.$t.out
 
-    sed -i -e 's/cib-last-written.*>/>/'\
+    sed -E \
+        -i -e 's/cib-last-written.*>/>/'\
         -e 's/ last-run=\"[0-9]*\"//'\
         -e 's/crm_feature_set="[^"]*" //'\
         -e 's/validate-with="[^"]*" //'\
@@ -778,12 +779,12 @@ for t in $tests; do
         -e 's/ last-rc-change=\"[0-9]*\"//'\
         -e 's|^/tmp/[0-9][0-9]*\.||'\
         -e 's/^Entity: line [0-9][0-9]*: //'\
-        -e 's/acl\.c:$[0-9][0-9]*$/acl.c:NNN/' \
-        -e 's/schemas\.c:$[0-9][0-9]*$/schemas.c:NNN/' \
-        -e 's/constraints\.:$[0-9][0-9]*$/constraints.:NNN/' \
-        -e 's/$validation ([0-9][0-9]* of $[0-9][0-9]*$).*$/\1X\2/' \
+        -e 's/acl\.c:([0-9][0-9]*)/acl.c:NNN/' \
+        -e 's/schemas\.c:([0-9][0-9]*)/schemas.c:NNN/' \
+        -e 's/constraints\.:([0-9][0-9]*)/constraints.:NNN/' \
+        -e 's/(validation $[0-9][0-9]* of )[0-9][0-9]*($.*)/\1X\2/' \
         -e 's/^Migration will take effect until: .*/Migration will take effect until:/' \
-        -e 's/ end=\"[-: 0123456789]*Z\?\"/ end=\"\"/' \
+        -e 's/ end=\"[-: 0123456789]+Z?\"/ end=\"\"/' \
 	$test_home/regression.$t.out
 
     if [ $do_save = 1 ]; then
-- 
2.16.4

Places

File bsc#1155290-0004-Tests-cts-cli-Use-extended-regular-expressions-1.1.patch of Package pacemaker.19778

Places