Patchwork [buildfix] tests: fix test-uncommit.t to not rely on GNU rm's flags behavior

login
register
mail settings
Submitter Augie Fackler
Date Sept. 15, 2017, 7:11 p.m.
Message ID <042b6de785af1dd5a65c.1505502702@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/23917/
State Accepted
Headers show

Comments

Augie Fackler - Sept. 15, 2017, 7:11 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1505502693 14400
#      Fri Sep 15 15:11:33 2017 -0400
# Node ID 042b6de785af1dd5a65c4caaaac7202d8a1004ab
# Parent  99a25fd51eee06baf00117114f84b630dd75f15e
tests: fix test-uncommit.t to not rely on GNU rm's flags behavior

FreeBSD rm(1) was failing thus:
Ryan McElroy - Sept. 18, 2017, 3 p.m.
On 9/15/17 8:11 PM, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1505502693 14400
> #      Fri Sep 15 15:11:33 2017 -0400
> # Node ID 042b6de785af1dd5a65c4caaaac7202d8a1004ab
> # Parent  99a25fd51eee06baf00117114f84b630dd75f15e
> tests: fix test-uncommit.t to not rely on GNU rm's flags behavior
>
> FreeBSD rm(1) was failing thus:
>
> --- test-uncommit.t
> +++ test-uncommit.t.err
> @@ -299,6 +299,9 @@
>
>     $ cd ..
>     $ rm repo1 -rf
> +  rm: repo1: is a directory
> +  rm: -rf: No such file or directory
> +  [1]
>
>   Testing uncommit while merge
>
> diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
> --- a/tests/test-uncommit.t
> +++ b/tests/test-uncommit.t
> @@ -298,7 +298,7 @@ Uncommit leaving an empty changeset
>     A Q
>   
>     $ cd ..
> -  $ rm repo1 -rf
> +  $ rm -rf repo1
>   
>   Testing uncommit while merge
>   
>

Patch LGTM
Augie Fackler - Sept. 18, 2017, 3:37 p.m.
> On Sep 18, 2017, at 11:00, Ryan McElroy <rm@fb.com> wrote:
> 
> 
> 
> On 9/15/17 8:11 PM, Augie Fackler wrote:
>> # HG changeset patch
>> # User Augie Fackler <augie@google.com>
>> # Date 1505502693 14400
>> #      Fri Sep 15 15:11:33 2017 -0400
>> # Node ID 042b6de785af1dd5a65c4caaaac7202d8a1004ab
>> # Parent  99a25fd51eee06baf00117114f84b630dd75f15e
>> tests: fix test-uncommit.t to not rely on GNU rm's flags behavior
>> 
>> FreeBSD rm(1) was failing thus:
>> 
>> --- test-uncommit.t
>> +++ test-uncommit.t.err
>> @@ -299,6 +299,9 @@
>> 
>>    $ cd ..
>>    $ rm repo1 -rf
>> +  rm: repo1: is a directory
>> +  rm: -rf: No such file or directory
>> +  [1]
>> 
>>  Testing uncommit while merge
>> 
>> diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
>> --- a/tests/test-uncommit.t
>> +++ b/tests/test-uncommit.t
>> @@ -298,7 +298,7 @@ Uncommit leaving an empty changeset
>>    A Q
>>      $ cd ..
>> -  $ rm repo1 -rf
>> +  $ rm -rf repo1
>>    Testing uncommit while merge
>>  
> 
> Patch LGTM

Martin pushed this and folded it into the commit that introduced the breakage. Sorry for not closing the loop on that. :/

Patch

--- test-uncommit.t
+++ test-uncommit.t.err
@@ -299,6 +299,9 @@ 

   $ cd ..
   $ rm repo1 -rf
+  rm: repo1: is a directory
+  rm: -rf: No such file or directory
+  [1]

 Testing uncommit while merge

diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -298,7 +298,7 @@  Uncommit leaving an empty changeset
   A Q
 
   $ cd ..
-  $ rm repo1 -rf
+  $ rm -rf repo1
 
 Testing uncommit while merge