[bug#41562] fix tests failing on flowee package

[bug#41562] fix tests failing on flowee package

[Tom Zander via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

The comment to disable it is there, but only one of the two CMake lines that 
enables this test was removed. So now really disable it.
-- 
Tom Zander

[-- Attachment #2: 0001-gnu-flowee-Disable-unpredictable-test.patch --]
[-- Type: text/x-patch, Size: 1531 bytes --]

From bc9a3faa045579f48804cf42f958409e51cdfbf6 Mon Sep 17 00:00:00 2001
From: TomZ <tomz@freedommail.ch>
Date: Wed, 27 May 2020 13:21:58 +0200
Subject: [PATCH] gnu: flowee: Disable unpredictable test.

* gnu/packages/finance.scm (flowee): The test 'api' has some timeouts
  which fail half the time in a build, so disable the test.
---
 gnu/packages/finance.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index f182057bb4..d176ac0660 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1531,7 +1531,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
          (base32 "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF")
+     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF" "-Denable_gui=false")
        #:phases
         (modify-phases %standard-phases
           (add-before 'configure 'make-qt-deterministic
@@ -1546,6 +1546,8 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
             (lambda _
               (substitute* "testing/CMakeLists.txt"
                 (("test_api") ""))
+              (substitute* "testing/CMakeLists.txt"
+                (("add_subdirectory\\(api\\)") ""))
               #t))
           (add-after 'configure 'set-build-info
             ;; Their genbuild.sh to generate a build.h fails in guix (no .git dir) .
-- 
2.25.1

[bug#41562] use consistent arguments.

[Tom Zander via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 34 bytes --]

As suggested on IRC
-- 
Tom Zander

[-- Attachment #2: 0001-gnu-flowee-Disable-unpredictable-test.patch --]
[-- Type: text/x-patch, Size: 1529 bytes --]

From bc9a3faa045579f48804cf42f958409e51cdfbf6 Mon Sep 17 00:00:00 2001
From: TomZ <tomz@freedommail.ch>
Date: Wed, 27 May 2020 13:21:58 +0200
Subject: [PATCH] gnu: flowee: Disable unpredictable test.

* gnu/packages/finance.scm (flowee): The test 'api' has some timeouts
  which fail half the time in a build, so disable the test.
---
 gnu/packages/finance.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index f182057bb4..d176ac0660 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1531,7 +1531,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
          (base32 "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF")
+     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF" "-Denable_gui=OFF")
        #:phases
         (modify-phases %standard-phases
           (add-before 'configure 'make-qt-deterministic
@@ -1546,6 +1546,8 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
             (lambda _
               (substitute* "testing/CMakeLists.txt"
                 (("test_api") ""))
+              (substitute* "testing/CMakeLists.txt"
+                (("add_subdirectory\\(api\\)") ""))
               #t))
           (add-after 'configure 'set-build-info
             ;; Their genbuild.sh to generate a build.h fails in guix (no .git dir) .
-- 
2.25.1

[bug#41562] use consistent arguments.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1899 bytes --]

Tom Zander via Guix-patches via <guix-patches@gnu.org> writes:

> As suggested on IRC
> -- 
> Tom Zander
>>From bc9a3faa045579f48804cf42f958409e51cdfbf6 Mon Sep 17 00:00:00 2001
> From: TomZ <tomz@freedommail.ch>
> Date: Wed, 27 May 2020 13:21:58 +0200
> Subject: [PATCH] gnu: flowee: Disable unpredictable test.
>
> * gnu/packages/finance.scm (flowee): The test 'api' has some timeouts
>   which fail half the time in a build, so disable the test.

Can you move this piece of information to a comment in the code?

Also, this should say (flowee)[arguments]: ...

> diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
> index f182057bb4..d176ac0660 100644
> --- a/gnu/packages/finance.scm
> +++ b/gnu/packages/finance.scm
> @@ -1531,7 +1531,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
>           (base32 "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc"))))
>      (build-system cmake-build-system)
>      (arguments
> -     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF")
> +     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF" "-Denable_gui=OFF")

This should probably not be here?

>         #:phases
>          (modify-phases %standard-phases
>            (add-before 'configure 'make-qt-deterministic
> @@ -1546,6 +1546,8 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
>              (lambda _
>                (substitute* "testing/CMakeLists.txt"
>                  (("test_api") ""))

Can this be removed?  It looks like it tries to do the same as your new
substitution below.

> +              (substitute* "testing/CMakeLists.txt"
> +                (("add_subdirectory\\(api\\)") ""))
>                #t))
>            (add-after 'configure 'set-build-info
>              ;; Their genbuild.sh to generate a build.h fails in guix (no .git dir) .
> -- 
> 2.25.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#41562] use consistent arguments.

[Tom Zander via Guix-patches via]

On vrijdag 29 mei 2020 22:56:18 CEST Marius Bakke wrote:
> Tom Zander via Guix-patches via <guix-patches@gnu.org> writes:
> > As suggested on IRC
> > 
> >>From bc9a3faa045579f48804cf42f958409e51cdfbf6 Mon Sep 17 00:00:00 2001
> >>
> > From: TomZ <tomz@freedommail.ch>
> > Date: Wed, 27 May 2020 13:21:58 +0200
> > Subject: [PATCH] gnu: flowee: Disable unpredictable test.
> > 
> > * gnu/packages/finance.scm (flowee): The test 'api' has some timeouts
> > 
> >   which fail half the time in a build, so disable the test.
> 
> Can you move this piece of information to a comment in the code?

Can you point to the file I find the code in, to add this to?

In case you mean the package description, its already there.

> Also, this should say (flowee)[arguments]: ...
> 
> > diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
> > index f182057bb4..d176ac0660 100644
> > --- a/gnu/packages/finance.scm
> > +++ b/gnu/packages/finance.scm
> > @@ -1531,7 +1531,7 @@ like Flowee the Hub, which Fulcrum connects to over
> > RPC.")> 
> >           (base32
> >           "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc"))))
> >      
> >      (build-system cmake-build-system)
> >      (arguments
> > 
> > -     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF")
> > +     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF"
> > "-Denable_gui=OFF")
> This should probably not be here?

Why not?

 
> >         #:phases
> >         
> >          (modify-phases %standard-phases
> >          
> >            (add-before 'configure 'make-qt-deterministic
> > 
> > @@ -1546,6 +1546,8 @@ like Flowee the Hub, which Fulcrum connects to over
> > RPC.")> 
> >              (lambda _
> >              
> >                (substitute* "testing/CMakeLists.txt"
> >                
> >                  (("test_api") ""))
> 
> Can this be removed?  It looks like it tries to do the same as your new
> substitution below.

Same file, two substitutes because there are two lines that need changing. 
CMake blocks for 1) the actual subdir and 2) a build-dependency for 'make-
check'
 
> > +              (substitute* "testing/CMakeLists.txt"
> > +                (("add_subdirectory\\(api\\)") ""))
> > 
> >                #t))
> >            
> >            (add-after 'configure 'set-build-info
> >            
> >              ;; Their genbuild.sh to generate a build.h fails in guix (no
> >              .git dir) .


-- 
Tom Zander

[bug#41562] use consistent arguments.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2527 bytes --]

Tom Zander <tomz@freedommail.ch> writes:

> On vrijdag 29 mei 2020 22:56:18 CEST Marius Bakke wrote:
>> Tom Zander via Guix-patches via <guix-patches@gnu.org> writes:
>> > As suggested on IRC
>> > 
>> >>From bc9a3faa045579f48804cf42f958409e51cdfbf6 Mon Sep 17 00:00:00 2001
>> >>
>> > From: TomZ <tomz@freedommail.ch>
>> > Date: Wed, 27 May 2020 13:21:58 +0200
>> > Subject: [PATCH] gnu: flowee: Disable unpredictable test.
>> > 
>> > * gnu/packages/finance.scm (flowee): The test 'api' has some timeouts
>> > 
>> >   which fail half the time in a build, so disable the test.
>> 
>> Can you move this piece of information to a comment in the code?
>
> Can you point to the file I find the code in, to add this to?
>
> In case you mean the package description, its already there.

Oh you're right.  In that case it would be clearer to change the commit
message to something like "really disable the black box tests".

>> Also, this should say (flowee)[arguments]: ...
>> 
>> > diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
>> > index f182057bb4..d176ac0660 100644
>> > --- a/gnu/packages/finance.scm
>> > +++ b/gnu/packages/finance.scm
>> > @@ -1531,7 +1531,7 @@ like Flowee the Hub, which Fulcrum connects to over
>> > RPC.")> 
>> >           (base32
>> >           "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc"))))
>> >      
>> >      (build-system cmake-build-system)
>> >      (arguments
>> > 
>> > -     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF")
>> > +     `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF"
>> > "-Denable_gui=OFF")
>> This should probably not be here?
>
> Why not?

I don't think passing -Denable_gui=OFF twice makes a difference.  Does
it?

>> >         #:phases
>> >         
>> >          (modify-phases %standard-phases
>> >          
>> >            (add-before 'configure 'make-qt-deterministic
>> > 
>> > @@ -1546,6 +1546,8 @@ like Flowee the Hub, which Fulcrum connects to over
>> > RPC.")> 
>> >              (lambda _
>> >              
>> >                (substitute* "testing/CMakeLists.txt"
>> >                
>> >                  (("test_api") ""))
>> 
>> Can this be removed?  It looks like it tries to do the same as your new
>> substitution below.
>
> Same file, two substitutes because there are two lines that need changing. 
> CMake blocks for 1) the actual subdir and 2) a build-dependency for 'make-
> check'

Makes sense, thanks for the explanation.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#41562] use consistent arguments.

[Tom Zander via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

On zaterdag 30 mei 2020 10:07:09 CEST Marius Bakke wrote:
> I don't think passing -Denable_gui=OFF twice makes a difference.  Does
> it?

LOL, yeah, you are right. It doesn't. 

Here is a new patch.
-- 
Tom Zander

[-- Attachment #2: 0001-gnu-flowee-Really-disable-black-box-test.patch --]
[-- Type: text/x-patch, Size: 1041 bytes --]

From 093cb41d3dbef752b9f53ea410dc49fbba64fb95 Mon Sep 17 00:00:00 2001
From: TomZ <tomz@freedommail.ch>
Date: Wed, 27 May 2020 13:21:58 +0200
Subject: [PATCH] gnu: flowee: Really disable black-box test.

* gnu/packages/finance.scm (flowee): The test 'api' has some timeouts
  which fail half the time in a build, so really disable the test.
---
 gnu/packages/finance.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index f182057bb4..28789c02d7 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1546,6 +1546,8 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
             (lambda _
               (substitute* "testing/CMakeLists.txt"
                 (("test_api") ""))
+              (substitute* "testing/CMakeLists.txt"
+                (("add_subdirectory\\(api\\)") ""))
               #t))
           (add-after 'configure 'set-build-info
             ;; Their genbuild.sh to generate a build.h fails in guix (no .git dir) .
-- 
2.25.1

bug#41562: use consistent arguments.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

Tom Zander <tomz@freedommail.ch> writes:

> On zaterdag 30 mei 2020 10:07:09 CEST Marius Bakke wrote:
>> I don't think passing -Denable_gui=OFF twice makes a difference.  Does
>> it?
>
> LOL, yeah, you are right. It doesn't. 

:-)

> Here is a new patch.

I fixed the missing [arguments] in the commit message and applied.
Thank you!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]