Merge branch 'travis-find_dll' into pythonnet_master

vmuriart · vmuriart · commit 49c85b4c0424 · 2017-02-14T13:55:08.000-07:00
Closes #352 Embedded tests start running and find dll now, but crash due to Pythonnet issues Disabled embedded tests again on travis until fixed issues.
diff --git a/.travis.yml b/.travis.yml
@@ -35,8 +35,17 @@ install:
   - coverage run setup.py build_ext --inplace
 
 script:
+  # Set-up and run python tests
   - export PYTHONPATH=`pwd`:$PYTHONPATH
   - python -m pytest
+
+  # Set-up dll path for embedded tests
+  - OUTPUT=$(python --version 2>&1)
+  - PY_VER=${OUTPUT:7:9}
+  - export LD_LIBRARY_PATH=/opt/python/$PY_VER/lib:$LD_LIBRARY_PATH
+  - echo $LD_LIBRARY_PATH
+  - cp Python.Runtime.dll.config src/embed_tests/bin/Python.Runtime.dll.config
+  # Run embedded tests
   # - mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
 
 after_success:
diff --git a/Python.Runtime.dll.config b/Python.Runtime.dll.config
@@ -4,17 +4,12 @@
        Keep this file next to Python.Runtime.dll
        For more information read:
        http://www.mono-project.com/Config
-       http://www.mono-project.com/Config_DllMap -->
+       http://www.mono-project.com/docs/advanced/pinvoke/dllmap -->
+  <!-- Only really needed for PY2-->
   <dllmap dll="python27" target="libpython2.7.so" os="!windows" />
   <dllmap dll="python33" target="libpython3.3.so" os="!windows" />
   <dllmap dll="python34" target="libpython3.4.so" os="!windows" />
   <dllmap dll="python35" target="libpython3.5.so" os="!windows" />
   <dllmap dll="python36" target="libpython3.6.so" os="!windows" />
   <dllmap dll="python37" target="libpython3.7.so" os="!windows" />
-  <dllmap dll="python27.dll" target="libpython2.7.so" os="!windows" />
-  <dllmap dll="python33.dll" target="libpython3.3.so" os="!windows" />
-  <dllmap dll="python34.dll" target="libpython3.4.so" os="!windows" />
-  <dllmap dll="python35.dll" target="libpython3.5.so" os="!windows" />
-  <dllmap dll="python36.dll" target="libpython3.6.so" os="!windows" />
-  <dllmap dll="python37.dll" target="libpython3.7.so" os="!windows" />
 </configuration>
