oom pushed a commit to branch c++-team
in repository guix.

commit 35f31cd586912ff256a2f7fd19f4f7f08793555f
Author: Greg Hogan <c...@greghogan.com>
AuthorDate: Wed May 14 17:53:27 2025 +0000

    gnu: manifold: Enable testing.
    
    * gnu/packages/engineering.scm (manifold)[source]: Add unreleased patch
    from upstream to enable testing.
    * gnu/packages/patches/manifold-enable-testing.patch: New file.
    : gnu/local.mk: Register it.
    
    Change-Id: If384ef0460b6fb4fbbbb90f2d6b9970e60ec2111
---
 gnu/local.mk                                       |  1 +
 gnu/packages/engineering.scm                       |  2 ++
 gnu/packages/patches/manifold-enable-testing.patch | 42 ++++++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 813cdecb61..51eddba8ff 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1846,6 +1846,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/lib-tl-for-telegram-memcpy.patch        \
   %D%/packages/patches/llhttp-ponyfill-object-fromentries.patch        \
   %D%/packages/patches/lvm2-no-systemd.patch                   \
+  %D%/packages/patches/manifold-enable-testing.patch           \
   %D%/packages/patches/maturin-no-cross-compile.patch          \
   %D%/packages/patches/mecab-variable-param.patch              \
   %D%/packages/patches/memtest86+-build-reproducibly.patch     \
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index ea98208d96..0b70423cf7 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2939,6 +2939,8 @@ specification can be downloaded at 
@url{http://3mf.io/specification/}.";)
              (url "https://github.com/elalish/manifold";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
+       ;; Patch is from upstream/master. Remove upon next release.
+       (patches (search-patches "manifold-enable-testing.patch"))
        (sha256
         (base32 "1f0k8937gk7b9100k99pmz1f17nzczpdk7797p2aijla0z29ddy1"))))
     (build-system cmake-build-system)
diff --git a/gnu/packages/patches/manifold-enable-testing.patch 
b/gnu/packages/patches/manifold-enable-testing.patch
new file mode 100644
index 0000000000..7ee4c3da67
--- /dev/null
+++ b/gnu/packages/patches/manifold-enable-testing.patch
@@ -0,0 +1,42 @@
+Copied from #1244 [https://github.com/elalish/manifold/pull/1244]
+
+https://github.com/elalish/manifold/commit/5145d3422b11ebfccb60ae7d69d5dac5f5af70c0
+
+
+From 5145d3422b11ebfccb60ae7d69d5dac5f5af70c0 Mon Sep 17 00:00:00 2001
+From: Daniel Engberg <daniel.engberg.li...@pyret.net>
+Date: Thu, 1 May 2025 10:49:01 +0200
+Subject: [PATCH] Add test target to CMake (#1244)
+
+Add manifold_test as test target for unit testing
+---
+ CMakeLists.txt      | 2 ++
+ test/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5e73d234..df6a3be07 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,6 +22,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+ set(CMAKE_VERBOSE_MAKEFILE ON)
+ 
++include(CTest)
++enable_testing()
+ include(GNUInstallDirs)
+ include(CMakeDependentOption)
+ 
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index f6fa4fc7b..fde649298 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -60,7 +60,7 @@ endif()
+ target_compile_options(manifold_test PRIVATE ${MANIFOLD_FLAGS})
+ exportbin(manifold_test)
+ 
+-add_test(test_all manifold_test)
++add_test(NAME manifold_test COMMAND manifold_test)
+ 
+ if(MANIFOLD_FUZZ)
+   fuzztest_setup_fuzzing_flags()

Reply via email to