[shark] 04/07: Cherry-pick patch series fixing FTBFS of the testsuite.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository shark.

commit fdac09cc83057d50f48939d0d4c8614f05c85934
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Aug 21 11:51:52 2016 +0100

    Cherry-pick patch series fixing FTBFS of the testsuite.
    
    Gbp-Dch: short
    Closes: #820701
---
 .../Fix-code-and-setup-of-HDF5-testcase.patch      | 40 ++++++++++++++++++++++
 ...-for-C-11-test-works-however-only-when-ev.patch | 22 ++++++++++++
 .../patches/fixed-HDF5-test.-fixes-64-and-43.patch | 21 ++++++++++++
 debian/patches/series                              |  3 ++
 4 files changed, 86 insertions(+)

diff --git a/debian/patches/Fix-code-and-setup-of-HDF5-testcase.patch b/debian/patches/Fix-code-and-setup-of-HDF5-testcase.patch
new file mode 100644
index 0000000..f0d7635
--- /dev/null
+++ b/debian/patches/Fix-code-and-setup-of-HDF5-testcase.patch
@@ -0,0 +1,40 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 18 Jul 2016 09:49:32 +0100
+Subject: Fix code and setup of HDF5 testcase.
+
+---
+ Test/CMakeLists.txt     | 7 ++++++-
+ Test/Data/HDF5Tests.cpp | 2 +-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Test/CMakeLists.txt b/Test/CMakeLists.txt
+index 478e315..54c7f6d 100644
+--- a/Test/CMakeLists.txt
++++ b/Test/CMakeLists.txt
+@@ -263,7 +263,12 @@ shark_add_test( RBM/ExactGradientTraining.cpp RBM_ExactGradientTraining)
+ 
+ # Copy test file
+ if(HDF5_FOUND)
+-	file( COPY test_data/ DESTINATION test_data/ )
++    add_custom_command(
++        TARGET Data_HDF5
++        POST_BUILD
++        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test_data
++            ${CMAKE_CURRENT_BINARY_DIR}/test_data
++    )
+ endif()
+ 
+ # Create output dir
+diff --git a/Test/Data/HDF5Tests.cpp b/Test/Data/HDF5Tests.cpp
+index df765c2..2c1331d 100644
+--- a/Test/Data/HDF5Tests.cpp
++++ b/Test/Data/HDF5Tests.cpp
+@@ -16,7 +16,7 @@ class HDF5Fixture
+ public:
+ 	HDF5Fixture()
+ 	:
+-		m_exampleFileName("../Test/test_data/testfile_for_import.h5"),
++		m_exampleFileName("./test_data/testfile_for_import.h5"),
+ 		m_datasetNameData1("data/data1"),
+ 		m_labelNameLabel1("data/label1"),
+ 		m_labelNameWrongLabel("data/wrong_label"),
diff --git a/debian/patches/change-necessary-for-C-11-test-works-however-only-when-ev.patch b/debian/patches/change-necessary-for-C-11-test-works-however-only-when-ev.patch
new file mode 100644
index 0000000..d041480
--- /dev/null
+++ b/debian/patches/change-necessary-for-C-11-test-works-however-only-when-ev.patch
@@ -0,0 +1,22 @@
+From: Christian Igel <igel at diku.dk>
+Date: Fri, 25 Mar 2016 15:29:01 +0100
+Subject: change necessary for C++11, test works, however,
+ only when evolked from top directory becauzse of sample file location
+
+---
+ Test/Data/HDF5Tests.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Test/Data/HDF5Tests.cpp b/Test/Data/HDF5Tests.cpp
+index ab46bb7..3e8cfd1 100644
+--- a/Test/Data/HDF5Tests.cpp
++++ b/Test/Data/HDF5Tests.cpp
+@@ -36,7 +36,7 @@ public:
+ 			list_of(10.0)(11.0)(12.0);
+ 
+ 		// vector of 4 elements
+-		m_expectedFromLabel1 = list_of(80.0)(81.0)(82.0)(83.0);
++		m_expectedFromLabel1 = list_of(80.0)(81.0)(82.0)(83.0).convert_to_container<std::vector<boost::int32_t> >();
+ 	}
+ 
+ 	/// Verify the @a actual matrix is the same as @a expected
diff --git a/debian/patches/fixed-HDF5-test.-fixes-64-and-43.patch b/debian/patches/fixed-HDF5-test.-fixes-64-and-43.patch
new file mode 100644
index 0000000..98d5e74
--- /dev/null
+++ b/debian/patches/fixed-HDF5-test.-fixes-64-and-43.patch
@@ -0,0 +1,21 @@
+From: Oswin Krause <oswin.krause at di.ku.dk>
+Date: Fri, 3 Jun 2016 14:27:03 +0200
+Subject: fixed HDF5 test. fixes #64 and 43
+
+---
+ Test/Data/HDF5Tests.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Test/Data/HDF5Tests.cpp b/Test/Data/HDF5Tests.cpp
+index 3e8cfd1..df765c2 100644
+--- a/Test/Data/HDF5Tests.cpp
++++ b/Test/Data/HDF5Tests.cpp
+@@ -16,7 +16,7 @@ class HDF5Fixture
+ public:
+ 	HDF5Fixture()
+ 	:
+-		m_exampleFileName("./Test/test_data/testfile_for_import.h5"),
++		m_exampleFileName("../Test/test_data/testfile_for_import.h5"),
+ 		m_datasetNameData1("data/data1"),
+ 		m_labelNameLabel1("data/label1"),
+ 		m_labelNameWrongLabel("data/wrong_label"),
diff --git a/debian/patches/series b/debian/patches/series
index feaaed9..f56dede 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,6 @@ Disable-privacy-breaching-content.patch
 Fix-CBLAS-detection-on-Debian.patch
 Fix-missing-iostream-include.patch
 Fix-missing-boost-namespace-prefix.patch
+change-necessary-for-C-11-test-works-however-only-when-ev.patch
+fixed-HDF5-test.-fixes-64-and-43.patch
+Fix-code-and-setup-of-HDF5-testcase.patch

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