Fix T68243: Python sqlite module not working on macOS
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 11 Feb 2020 09:15:31 +0000 (10:15 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 11 Feb 2020 09:17:35 +0000 (10:17 +0100)
build_files/build_environment/cmake/sqlite.cmake
tests/python/CMakeLists.txt
tests/python/bl_bundled_modules.py [new file with mode: 0644]

index 647e50b315aa85c557c082da594edbb14695ad54..9fa2fa7c70887b32861f55fca0280d8c90f91af8 100644 (file)
 set(SQLITE_CONFIGURE_ENV echo .)
 set(SQLITE_CONFIGURATION_ARGS)
 
-if(UNIX AND NOT APPLE)
-  set(SQLITE_LDFLAGS -Wl,--as-needed)
+if(UNIX)
+  if(NOT APPLE)
+    set(SQLITE_LDFLAGS -Wl,--as-needed)
+  endif()
   set(SQLITE_CFLAGS
     "-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
     -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
index b5af3e1423742bc3bb229365fd79122fd553be3b..f287ba5ed02c80399fa0fca56d652c660f390643 100644 (file)
@@ -79,6 +79,11 @@ add_blender_test(
   --python ${CMAKE_CURRENT_LIST_DIR}/bl_load_py_modules.py
 )
 
+add_blender_test(
+  script_bundled_modules
+  --python ${CMAKE_CURRENT_LIST_DIR}/bl_bundled_modules.py
+)
+
 # test running operators doesn't segfault under various conditions
 if(USE_EXPERIMENTAL_TESTS)
   add_blender_test(
diff --git a/tests/python/bl_bundled_modules.py b/tests/python/bl_bundled_modules.py
new file mode 100644 (file)
index 0000000..6f75718
--- /dev/null
@@ -0,0 +1,30 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+# Test that modules we ship with our Python installation are available
+
+import bz2
+import cffi
+import lzma
+import numpy
+import sqlite3
+import ssl
+import zlib
+