Merge #180578: proj_7: drop tests that time out
... with newest sqlite (into staging-next)
This commit is contained in:
commit
8e1f71ebce
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
|
||||
sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
|
||||
})
|
||||
./tests-sqlite-3.39.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString (version == "7.2.1") ''
|
||||
|
13
pkgs/development/libraries/proj/tests-sqlite-3.39.patch
Normal file
13
pkgs/development/libraries/proj/tests-sqlite-3.39.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Drop tests that time out with newest sqlite.
|
||||
https://github.com/OSGeo/PROJ/issues/3254
|
||||
|
||||
--- a/test/cli/CMakeLists.txt
|
||||
+++ b/test/cli/CMakeLists.txt
|
||||
@@ -16 +15,0 @@
|
||||
-proj_add_test_script_sh("testprojinfo" PROJINFO_BIN)
|
||||
--- a/test/unit/CMakeLists.txt
|
||||
+++ b/test/unit/CMakeLists.txt
|
||||
@@ -144,3 +143,0 @@
|
||||
-add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api)
|
||||
-set_property(TEST proj_test_cpp_api
|
||||
- PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT})
|
Loading…
Reference in New Issue
Block a user