[med-svn] [Git][med-team/insighttoolkit][master] 3 commits: Fix d/rules to comply with patch fix_python_tests

[Gert Wollny]

Gert Wollny pushed to branch master at Debian Med / insighttoolkit


Commits:
7edb3842 by Gilles Filippini at 2019-11-01T16:41:20Z
Fix d/rules to comply with patch fix_python_tests

and actually fix the related test failure.

- - - - -
890309c7 by Gilles Filippini at 2019-11-01T16:43:53Z
Enable back Python template test

- - - - -
b48f8aff by Gert Wollny at 2019-11-01T16:58:21Z
Merge branch 'master' into 'master'

Fix d/rules to comply with patch fix_python_tests

See merge request med-team/insighttoolkit!1
- - - - -


4 changed files:

- debian/changelog
- − debian/patches/disable_python_template_test
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+insighttoolkit4 (4.13.2-dfsg1-1~exp7) UNRELEASED; urgency=medium
+
+  * Fix d/rules to comply with patch fix_python_tests.diff and actually
+    fix the related Python template test failure
+  * Drop d/p/disable_python_template_test
+
+ -- Gilles Filippini <pini at debian.org>  Fri, 01 Nov 2019 17:38:29 +0100
+
 insighttoolkit4 (4.13.2-dfsg1-1~exp6) experimental; urgency=medium
 
   * d/rules: drop 4D wrapping, since the build gets too big 


=====================================
debian/patches/disable_python_template_test deleted
=====================================
@@ -1,14 +0,0 @@
-Description: Disable template tests since they only check available templates
- and whether they pass depends on the configuration. 
-Author: Gert Wollny <gewo at debian.org>
---- a/Wrapping/Generators/Python/Tests/CMakeLists.txt
-+++ b/Wrapping/Generators/Python/Tests/CMakeLists.txt
-@@ -29,7 +29,7 @@
- if(ITK_WRAP_unsigned_char AND WRAP_2)
-   itk_python_add_test(NAME PythonTypemaps COMMAND typemaps.py)
- 
--  itk_python_add_test(NAME PythonTemplate COMMAND template.py)
-+#  itk_python_add_test(NAME PythonTemplate COMMAND template.py)
- 
-   itk_python_add_test(NAME PythonModifiedTime COMMAND ModifiedTime.py)
- 


=====================================
debian/patches/series
=====================================
@@ -8,4 +8,3 @@ itk4.12.0-resource_cprobe.patch
 disable-doxygen.patch
 simplify-system-gtest.patch
 fix-minc-includes.patch
-disable_python_template_test


=====================================
debian/rules
=====================================
@@ -16,13 +16,13 @@ ENABLE_PYTHON=1
 ifeq ($(DEB_HOST_ARCH),i386)
   ENABLE_FFTW=OFF
 #(unsigned long) == (unsigned int) on 32 bit, since itk 4.10 or g++-5.4   
-  ENABLE_UNSIGNED_LONG=OFF 
+  ENABLE_UNSIGNED_LONG_LONG=OFF
   # Tests are permanently failing, try force rounding to normal double 
   # accuracy
   export DEB_CXXFLAGS_MAINT_APPEND=-ffloat-store
 else
   ENABLE_FFTW=ON
-  ENABLE_UNSIGNED_LONG=ON 
+  ENABLE_UNSIGNED_LONG_LONG=ON
 endif 
 
 CMAKE_FLAGS = \
@@ -67,7 +67,7 @@ CMAKE_FLAGS = \
 	-DITK_USE_SYSTEM_SWIG:BOOL=ON \
 	-DITK_USE_SYSTEM_CASTXML:BOOL=ON \
 	-DITK_WRAP_IMAGE_DIMS="2;3" \
-	-DITK_WRAP_unsigned_long:BOOL=$(ENABLE_UNSIGNED_LONG) \
+	-DITK_WRAP_unsigned_long_long:BOOL=$(ENABLE_UNSIGNED_LONG_LONG) \
 	-DITK_WRAP_double:BOOL=ON \
         -DITK_WRAP_vector_double:BOOL=ON \
         -DITK_WRAP_covariant_vector_double:BOOL=ON \



View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/compare/e40526a367d600b8ef550c96872f34e03d6d64ca...b48f8affbd1087e4e306545bf4fae823d39f5469

-- 
View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/compare/e40526a367d600b8ef550c96872f34e03d6d64ca...b48f8affbd1087e4e306545bf4fae823d39f5469
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191101/869a9ef3/attachment-0001.html>