Subject: [bug#41562] use consistent arguments.

From: Tom Zander <[email-masked]>
Date: Sat, 30 May 2020 09:40:04 +0200

On vrijdag 29 mei 2020 22:56:18 CEST Marius Bakke wrote:
> Tom Zander via Guix-patches via <[email-masked]> writes:
> > As suggested on IRC
> > 
> >>From bc9a3faa045579f48804cf42f958409e51cdfbf6 Mon Sep 17 00:00:00 2001
> >>
> > From: TomZ <[email-masked]>
> > 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