export: fix lib file move

openturns · Dec 1, 2023 · 4ef688f · 4ef688f
1 parent e9a3cf2
commit 4ef688f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/otfmi/function_exporter.py b/otfmi/function_exporter.py
@@ -717,7 +717,8 @@ def export_model(self, model_path, gui=False, verbose=False, binary=True, mode="
             list_file = [className + extension]
             if binary:
                 # licwrapper.a/.so, cwrapper.lib/dll
-                list_file += glob.glob(os.path.join(self._workdir, "*cwrapper*"))
+                libfiles = glob.glob(os.path.join(self._workdir, "*cwrapper*"))
+                list_file += [os.path.basename(x) for x in libfiles]
             else:
                 list_file += ["wrapper" + c_ext, "CMakeLists.txt"]
             for file in list_file:

diff --git a/test/test_export.py b/test/test_export.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import glob
 import openturns as ot
 import otfmi
 import os
@@ -121,6 +122,9 @@ def test_export_model(mode, binary):
     assert os.path.isfile(path_model), f"model not created in file {path_model}"
 
     if binary:
+        libfiles = glob.glob(os.path.join(temp_path, "*cwrapper*"))
+        assert len(libfiles) > 0, "lib file not created"
+
         # write simulation mos
         path_mos = os.path.join(temp_path, "simulate.mos")
         with open(path_mos, "w") as mos:
@@ -131,7 +135,7 @@ def test_export_model(mode, binary):
     else:
         c_ext = ".cxx" if mode == "cxx" else ".c"
         assert os.path.isfile(os.path.join(temp_path, "wrapper" + c_ext)), "wrapper source not created"
-        assert os.path.isfile(os.path.join(temp_path, "CMakeLists.txt")), "cmakelists not created"
+        assert os.path.isfile(os.path.join(temp_path, "CMakeLists.txt")), "CMakeLists not created"
     shutil.rmtree(temp_path)