Issue #304: add two new functions to test external lib version

Author: sergey-dryabzhinsky

setup.py

@@ -264,7 +264,7 @@ def which(bin_exe):
     pkgconf = False
 
 #if SUP_EXTERNAL:
-if platform.system() == "Linux" and "build_ext" in sys.argv or "build" in sys.argv or "bdist_wheel" in sys.argv:
+if platform.system() == "Linux" and "build_ext" in sys.argv or "build" in sys.argv or "bdist_wheel" in sys.argv or "test" in sys.argv:
     # You should add external library by option: --libraries zstd
     # And probably include paths by option: --include-dirs /usr/include/zstd
     # And probably library paths by option: --library-dirs /usr/lib/i386-linux-gnu
@@ -521,7 +521,7 @@ def build_extensions(self):
             'compress/zstd_preSplit.c',
             'compress/zstdmt_compress.c',
             'compress/zstd_fast.c',
-            'compress/zstd_double_fast.c',
+#            'compress/zstd_double_fast.c',
             'compress/zstd_lazy.c',
             'compress/zstd_opt.c',
             'compress/zstd_ldm.c',
@@ -550,10 +550,16 @@ def build_extensions(self):
             ]:
             zstdFiles.append('zstd/lib/'+f)
 
+# files needed always, even for external
 zstdFiles.append('src/debug.c')
 zstdFiles.append('src/util.c')
 zstdFiles.append('src/python-zstd.c')
 
+#for f in [
+#        'decompress/zstd_decompress.c',
+#        'decompress/zstd_ddict.c',
+#    ]:
+#    zstdFiles.append('zstd/lib/'+f)
 
 # Another dirty hack
 def my_test_suite():
@@ -580,6 +586,8 @@ def my_test_suite():
 ld=f.read()
 f.close()
 
+if SUP_DEBUG:
+	print("debug: ext_libraries:%r" % (ext_libraries))
 setup(
     name='zstd',
     version=PKG_VERSION_STR,

src/python-zstd.c

@@ -329,9 +329,24 @@ static PyObject *py_zstd_module_version(PyObject* self, PyObject *args)
 }
 
 /**
- * Returns ZSTD library version as string
+ * Returns ZSTD library version as string - compiled with
  */
-static PyObject *py_zstd_library_version(PyObject* self, PyObject *args)
+static PyObject *py_zstd_library_version_compiled(PyObject* self, PyObject *args)
+{
+     UNUSED(self);
+     UNUSED(args);
+	
+#if PY_MAJOR_VERSION >= 3
+    return PyUnicode_FromFormat("%s", ZSTD_VERSION_STRING);
+#else
+    return PyString_FromFormat("%s", ZSTD_VERSION_STRING);
+#endif
+}
+
+/**
+ * Returns ZSTD library version as string - loaded with
+ */
+static PyObject *py_zstd_library_version_loaded(PyObject* self, PyObject *args)
 {
      UNUSED(self);
      UNUSED(args);
@@ -545,7 +560,9 @@ static PyMethodDef ZstdMethods[] = {
     {"dumps",  py_zstd_compress_mt, METH_VARARGS, COMPRESS_DOCSTRING},
     {"loads",  py_zstd_uncompress, METH_VARARGS, UNCOMPRESS_DOCSTRING},
     {"version",  py_zstd_module_version, METH_NOARGS, VERSION_DOCSTRING},
-    {"ZSTD_version",  py_zstd_library_version, METH_NOARGS, ZSTD_VERSION_DOCSTRING},
+    {"ZSTD_version",  py_zstd_library_version_compiled, METH_NOARGS, ZSTD_VERSION_DOCSTRING},
+    {"ZSTD_version_compiled",  py_zstd_library_version_compiled, METH_NOARGS, NULL},
+    {"ZSTD_version_loaded",  py_zstd_library_version_loaded, METH_NOARGS, NULL},
     {"ZSTD_version_number",  py_zstd_library_version_int, METH_NOARGS, ZSTD_INT_VERSION_DOCSTRING},
     {"ZSTD_threads_count",  py_zstd_threads_count, METH_NOARGS, ZSTD_THREADS_COUNT_DOCSTRING},
     {"ZSTD_max_threads_count",  py_zstd_max_threads_count, METH_NOARGS, ZSTD_MAX_THREADS_COUNT_DOCSTRING},

src/python-zstd.h

@@ -96,7 +96,8 @@ static PyObject *py_zstd_compress_mt(PyObject* self, PyObject *args);
 static PyObject *py_zstd_uncompress(PyObject* self, PyObject *args);
 static PyObject *py_zstd_check(PyObject* self, PyObject *args);
 static PyObject *py_zstd_module_version(PyObject* self, PyObject *args);
-static PyObject *py_zstd_library_version(PyObject* self, PyObject *args);
+static PyObject *py_zstd_library_version_compiled(PyObject* self, PyObject *args);
+static PyObject *py_zstd_library_version_loaded(PyObject* self, PyObject *args);
 static PyObject *py_zstd_library_version_int(PyObject* self, PyObject *args);
 static PyObject *py_zstd_library_external(PyObject* self, PyObject *args);
 static PyObject *py_zstd_with_threads(PyObject* self, PyObject *args);

tests/base.py

@@ -22,16 +22,18 @@ def raise_skip(msg):
 log = logging.getLogger('ZSTD')
 log.info("Python version: %s" % sys.version)
 log.info("Machine:%s; processor:%s; system:%r; release:%r" % ( platform.machine(), platform.processor(), platform.system(), platform.release()))
-log.info("Module exported interface:%r"% dir(zstd))
-log.info("libzstd linked external:%r"% zstd.ZSTD_external())
-log.info("libzstd built with legacy formats support:%r"% zstd.ZSTD_legacy_support())
-log.info("zstd max number of threads:%r"% zstd.ZSTD_max_threads_count())
-log.info("zstd found CPU cores :%r"% zstd.ZSTD_threads_count())
-log.info("zstd default compression level:%r"% zstd.ZSTD_default_compression_level())
-log.info("zstd max compression level:%r"% zstd.ZSTD_max_compression_level())
-log.info("zstd min compression level:%r"% zstd.ZSTD_min_compression_level())
+log.info("Module exported interfac e:%r"% dir(zstd))
+log.info("libzstd linked external: %r"% zstd.ZSTD_external())
+log.info("libzstd built with legacy formats support: %r"% zstd.ZSTD_legacy_support())
+log.info("zstd max number of threads: %r"% zstd.ZSTD_max_threads_count())
+log.info("zstd found CPU cores : %r"% zstd.ZSTD_threads_count())
+log.info("zstd default compression level: %r"% zstd.ZSTD_default_compression_level())
+log.info("zstd max compression level: %r"% zstd.ZSTD_max_compression_level())
+log.info("zstd min compression level: %r"% zstd.ZSTD_min_compression_level())
 log.info("pyzstd module version: %r"% zstd.version())
 log.info("libzstd version: %r"% zstd.ZSTD_version())
+log.info("Compiled with libzstd version: %r"% zstd.ZSTD_version_compiled())
+log.info("Loaded with libzstd version: %r"% zstd.ZSTD_version_loaded())
 
 
 # Classic lorem ipsum