[Debian-astro-commits] [gyoto] 01/01: Fix autopkgtest tests and include testing the python plugins

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 04b205e04d00262afaffa598aeabf970f40d2b94
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Wed Sep 14 20:44:30 2016 +0200

    Fix autopkgtest tests and include testing the python plugins
---
 debian/python-gyoto.install   |  2 +-
 debian/tests/control          |  2 +-
 debian/tests/gyoto            |  2 --
 debian/tests/gyoto-mpi        |  1 -
 debian/tests/python-gyoto     | 12 +++++++++++-
 debian/tests/python-gyoto-mpi | 11 ++++++++++-
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/debian/python-gyoto.install b/debian/python-gyoto.install
index 09c693e..14f0ce3 100755
--- a/debian/python-gyoto.install
+++ b/debian/python-gyoto.install
@@ -1,3 +1,3 @@
 #! /usr/bin/dh-exec
-python-plugins/libgyoto-python.so
+python-plugins/libgyoto-python.so usr/lib/${DEB_HOST_MULTIARCH}/gyoto/${DEB_GYOTO_SOVERS}/
 python-plugins/libgyoto-python2*.so usr/lib/${DEB_HOST_MULTIARCH}/gyoto/${DEB_GYOTO_SOVERS}/
diff --git a/debian/tests/control b/debian/tests/control
index a627786..9fb7905 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -11,7 +11,7 @@ Depends: yorick-gyoto, gyoto-bin, openmpi-bin
 Restrictions: allow-stderr
 
 Tests: python-gyoto
-Depends: python-gyoto, python3-gyoto,
+Depends: python-gyoto, python3-gyoto, gyoto-bin,
 	 python-all, python3-all,
 	 python-numpy, python3-numpy,
 	 python-matplotlib, python3-matplotlib
diff --git a/debian/tests/gyoto b/debian/tests/gyoto
index ab5faba..8427081 100755
--- a/debian/tests/gyoto
+++ b/debian/tests/gyoto
@@ -5,8 +5,6 @@ EXAMPLES_DIR=/usr/share/doc/libgyoto5/examples
 BASE_NAMES=`basename -s.xml ${EXAMPLES_DIR}/*.xml | sed 's/example-[^ ]*-rotstar3_1//'`
 GYOTO="/usr/bin/gyoto --nprocesses=0 --nthreads=4 --resolution=32"
 
-export GYOTO_PLUGINS=stdplug,python
-
 for base in ${BASE_NAMES} ; do
     ${GYOTO} ${EXAMPLES_DIR}/${base}.xml \!${ADT_ARTIFACTS}/${base}.fits ;
 done
diff --git a/debian/tests/gyoto-mpi b/debian/tests/gyoto-mpi
index c4c1cae..dfc6437 100755
--- a/debian/tests/gyoto-mpi
+++ b/debian/tests/gyoto-mpi
@@ -6,7 +6,6 @@ BASE_NAMES=`basename -s.xml ${EXAMPLES_DIR}/*.xml | sed 's/example-[^ ]*-rotstar
 GYOTO="/usr/bin/gyoto --nprocesses=4 --nthreads=1 --resolution=32"
 
 export OMPI_MCA_orte_rsh_agent=/bin/false
-export GYOTO_PLUGINS=stdplug,python
 
 for base in ${BASE_NAMES} ; do
     orterun --mca btl_tcp_if_include lo ${GYOTO} ${EXAMPLES_DIR}/${base}.xml \!${ADT_ARTIFACTS}/${base}-mpi.fits ;
diff --git a/debian/tests/python-gyoto b/debian/tests/python-gyoto
index d39ab9c..2e7167e 100755
--- a/debian/tests/python-gyoto
+++ b/debian/tests/python-gyoto
@@ -8,9 +8,19 @@ cp -a doc/examples ${ADTTMP}/doc/
 mkdir -p ${ADTTMP}/python
 cd ${ADTTMP}/python
 echo "backend : PDF" > matplotlibrc
+cp ${SRC_ROOT}/plugins/python/doc/examples/* ./
+BASE_NAMES=`basename -s.xml *.xml`
+GYOTO="/usr/bin/gyoto --nprocesses=0 --nthreads=1 --resolution=32"
 
-for python in `pyversions -s` `py3versions -s` ; do
+for python in python python2 python3 `pyversions -s` `py3versions -s` ; do
+    echo "**** Test Python version: $python ****" 
     $python ${SRC_ROOT}/python/example.py ;
+    $python test.py ;
+    mkdir -p ${ADT_ARTIFACTS}/$python
+    export GYOTO_PLUGINS=$python,stdplug
+    for base in ${BASE_NAMES} ; do
+	${GYOTO} ${base}.xml \!${ADT_ARTIFACTS}/${python}/${base}.fits ;
+    done ;
 done
 
 exit 0
diff --git a/debian/tests/python-gyoto-mpi b/debian/tests/python-gyoto-mpi
index 93c3f81..c2cc1c2 100755
--- a/debian/tests/python-gyoto-mpi
+++ b/debian/tests/python-gyoto-mpi
@@ -8,11 +8,20 @@ cp -a doc/examples ${ADTTMP}/doc/
 mkdir -p ${ADTTMP}/python
 cd ${ADTTMP}/python
 echo "backend : PDF" > matplotlibrc
+cp ${SRC_ROOT}/plugins/python/doc/examples/* ./
+BASE_NAMES=`basename -s.xml *.xml`
+GYOTO="/usr/bin/gyoto --nprocesses=4 --nthreads=1 --resolution=32"
 
 export OMPI_MCA_orte_rsh_agent=/bin/false
 
-for python in `pyversions -s` `py3versions -s` ; do
+for python in python python2 python3 `pyversions -s` `py3versions -s` ; do
+    echo "**** Test Python version: $python ****" 
     orterun --mca btl_tcp_if_include lo $python ${SRC_ROOT}/python/example-mpi.py ;
+    mkdir -p ${ADT_ARTIFACTS}/${python}-mpi
+    export GYOTO_PLUGINS=$python,stdplug
+    for base in ${BASE_NAMES} ; do
+	 orterun --mca btl_tcp_if_include lo ${GYOTO} ${base}.xml \!${ADT_ARTIFACTS}/${python}-mpi/${base}.fits ;
+    done ;
 done
 
 exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git