diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-11-17 23:24:42 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-17 23:43:14 +0100 |
commit | 3a317f7476f8c6012e166ff9f340f861938721c9 (patch) | |
tree | 946e398c37912cfc03be7306951ae87bfeb130fa /gnu/packages/patches/bear-disable-preinstall-tests.patch | |
parent | e55547bf70384691712047912c793c517debd2ec (diff) | |
parent | 62e707d67caf1dab2af411a69ff8cec4b2dc686e (diff) | |
download | guix-patches-3a317f7476f8c6012e166ff9f340f861938721c9.tar guix-patches-3a317f7476f8c6012e166ff9f340f861938721c9.tar.gz |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/patches/bear-disable-preinstall-tests.patch')
-rw-r--r-- | gnu/packages/patches/bear-disable-preinstall-tests.patch | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/gnu/packages/patches/bear-disable-preinstall-tests.patch b/gnu/packages/patches/bear-disable-preinstall-tests.patch index c65095405f..ffb31c28f1 100644 --- a/gnu/packages/patches/bear-disable-preinstall-tests.patch +++ b/gnu/packages/patches/bear-disable-preinstall-tests.patch @@ -1,20 +1,9 @@ -From d7d0cdd48017679e8529f8475d1b9902944cf243 Mon Sep 17 00:00:00 2001 -From: Brett Gilio <brettg@gnu.org> -Date: Sun, 20 Dec 2020 14:43:30 -0600 -Subject: [PATCH] Disallow Pre-install Checks - ---- - CMakeLists.txt | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c6d27..73b4ace 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -58,10 +58,6 @@ ExternalProject_Add(BearSource - -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} +@@ -60,10 +60,6 @@ ExternalProject_Add(BearSource -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS} + -DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS} - TEST_BEFORE_INSTALL - 1 - TEST_COMMAND @@ -22,9 +11,9 @@ index 45c6d27..73b4ace 100644 ) # Run the functional tests -@@ -73,12 +69,8 @@ if (ENABLE_FUNC_TESTS) - BearSource - CMAKE_CACHE_ARGS +@@ -77,12 +73,8 @@ if (ENABLE_FUNC_TESTS) + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX} - TEST_BEFORE_INSTALL - 1 @@ -35,6 +24,3 @@ index 45c6d27..73b4ace 100644 ) endif () --- -2.29.2 - |