GNU bug report logs - #65565
[PATCH] gnu: chaiscript: Fix tests.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65565 in the body.
You can then email your comments to 65565 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: guix-patches <at> gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [PATCH] gnu: chaiscript: Fix tests.
Date: Sun, 27 Aug 2023 20:30:16 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/cpp.scm (chaiscript)[arguments]: Add fix-tests phase.
---
 gnu/packages/cpp.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 3b949198c7..4681963794 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -511,6 +511,15 @@ (define-public chaiscript
        (sha256
         (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))))
     (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-tests
+            (lambda _
+              ;; Its bundled catch2 fails to build with glibc-2.35.
+              (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
+                         "unittests/catch.hpp"))))))
     (home-page "https://chaiscript.com/")
     (synopsis "Embedded scripting language designed for C++")
     (description

base-commit: 8b4a248fc4765212a4103c4520ae1f901937df41
-- 
2.41.0

Message #8 received at 65565 <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: iyzsong <at> envs.net
Cc: 65565 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: chaiscript: Fix tests.
Date: Sun, 27 Aug 2023 23:09:08 +0800

> +    (arguments
> +     (list
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (add-after 'unpack 'fix-tests
> +            (lambda _
> +              ;; Its bundled catch2 fails to build with glibc-2.35.
> +              (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
> +                         "unittests/catch.hpp")))))
Bundling a newer catch2 is not the solution, it's better to delete the bundled header so that it uses the catch2 provided in its inputs.

Message #11 received at 65565 <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: 65565 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [PATCH v2] gnu: chaiscript: Fix tests.
Date: Tue, 29 Aug 2023 18:40:24 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/cpp.scm (chaiscript)[source]: Add snippet.
[inputs]: Add catch2.
---
 gnu/packages/cpp.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 3b949198c7..2f8cc2ce25 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -509,8 +509,17 @@ (define-public chaiscript
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))))
+        (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))
+       (modules '((guix build utils)))
+       ;; It's bundled catch2 fails to build.
+       (snippet '(begin
+                   (delete-file "unittests/catch.hpp")
+                   (substitute* "unittests/compiled_tests.cpp"
+                     (("catch[.]hpp") "catch2/catch.hpp"))
+                   (substitute* "unittests/type_info_test.cpp"
+                     (("catch[.]hpp") "catch2/catch.hpp"))))))
     (build-system cmake-build-system)
+    (inputs (list catch2))
     (home-page "https://chaiscript.com/")
     (synopsis "Embedded scripting language designed for C++")
     (description

base-commit: 715d203b414727be43e405d09e86aa823125a4b3
-- 
2.41.0

Message #14 received at 65565 <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Adam Faiz <adam.faiz <at> disroot.org>
Cc: 65565 <at> debbugs.gnu.org
Subject: Re: [bug#65565] [PATCH] gnu: chaiscript: Fix tests.
Date: Tue, 29 Aug 2023 18:46:41 +0800

Adam Faiz <adam.faiz <at> disroot.org> writes:

>> +    (arguments
>> +     (list
>> +      #:phases
>> +      #~(modify-phases %standard-phases
>> +          (add-after 'unpack 'fix-tests
>> +            (lambda _
>> +              ;; Its bundled catch2 fails to build with glibc-2.35.
>> +              (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
>> +                         "unittests/catch.hpp")))))
> Bundling a newer catch2 is not the solution, it's better to delete the
> bundled header so that it uses the catch2 provided in its inputs.

Um, this copy-file has the same result, it replace the bundled one with
our catch2, anyway I sent a v2 with 'snippet' and 'inputs'.

Thanks.

Message #19 received at 65565-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: 65557-done <at> debbugs.gnu.org, 65562-done <at> debbugs.gnu.org,
 65561-done <at> debbugs.gnu.org, 65565-done <at> debbugs.gnu.org,
 65564-done <at> debbugs.gnu.org, 65566-done <at> debbugs.gnu.org,
 65593-done <at> debbugs.gnu.org, 65618-done <at> debbugs.gnu.org,
 65619-done <at> debbugs.gnu.org
Subject: Closing
Date: Thu, 31 Aug 2023 18:06:27 +0800

Pushed now, closing!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.