diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch')
| -rw-r--r-- | gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch b/gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch deleted file mode 100644 index 5a75b6f40f..0000000000 --- a/gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 40e53d639d86337cf58be3a2b9750b6c97a3c740 Mon Sep 17 00:00:00 2001 -From: Justus Winter <teythoon@avior.uberspace.de> -Date: Tue, 21 Jul 2020 16:10:21 +0200 -Subject: [PATCH 2/2] Disable ruby-rnp tests. - -Prevents cmake from cloning the ruby-rnp repository in order to run its tests. ---- - src/tests/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt -index d3c4fbe6..e7e1965e 100644 ---- a/src/tests/CMakeLists.txt -+++ b/src/tests/CMakeLists.txt -@@ -125,7 +125,7 @@ gtest_discover_tests(rnp_tests - - # ruby-rnp - # cruby does not currently play nice with ASaN et al. --if (NOT ENABLE_SANITIZERS AND BUILD_SHARED_LIBS AND NOT WIN32) -+if (NOT ENABLE_SANITIZERS AND BUILD_SHARED_LIBS AND NOT WIN32 AND IGNORE) - include(ExternalProject) - set(_sourcedir "${CMAKE_BINARY_DIR}/ruby-rnp") - if (DEFINED ENV{RUBY_RNP_INSTALL}) --- -2.20.1 - |