On Thu, Oct 15, 2015 at 3:57 AM, Pádraig Brady <[email protected]> wrote:
> On 15/10/15 11:33, Bernhard Voelker wrote:
>> On 10/15/2015 11:32 AM, Pádraig Brady wrote:
>>> How about the attached on top?
>>
>> I'm now on a newer openSUSE host where GDB doesn't have this bug anymore,
>> but from reading the patch looks good ... except this tiny typo:
>>
>>> * tests/rm/r-root.sh: SKip the test if there are gdb warnings
>>
>> s/SKip/Skip/
>>
>> Another issue: during the creation of the test, I forgot to initialize
>> the variable CU_TEST_SKIP_EXIT at the very beginning.  It's unlikely
>> that someone has such a variable set, but would you mind to squash
>> an 'unset CU_TEST_SKIP_EXIT' into the commit?
>
> Pushed with those adjustments.

Here's a small improvement:
From 819ece6e9206944857057acc7a0fa732beea501a Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email protected]>
Date: Thu, 15 Oct 2015 08:10:08 -0700
Subject: [PATCH] tests: tweak sed expressions in rm/r-root.sh

* tests/rm/r-root.sh (clean_rm_err_): Use "," as sed delimiter and
mostly single quotes to avoid some escaping. Also, combine the two
sed transformations into one.
---
 tests/rm/r-root.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/rm/r-root.sh b/tests/rm/r-root.sh
index cf16239..e94286c 100755
--- a/tests/rm/r-root.sh
+++ b/tests/rm/r-root.sh
@@ -102,8 +102,7 @@ EOF.py
 # Strip that part off for the following comparison.
 clean_rm_err_()
 {
-  sed "s/.*rm: /rm: /; \
-       s/\(rm: it is dangerous to operate recursively on\).*$/\1 '\/'/"
+  sed 's,.*\(rm: it is dangerous to operate recursively on\).*$,\1 '"'/',"
 }

 #-------------------------------------------------------------------------------
-- 
2.6.0

Reply via email to