[mlpack-git] master: Fix failing HDF5 tests (handle old Armadillo bug that was probably my fault anyway). (5aa6065)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/8e3a4248904a7e2b3f1833cf41fb56cfe4146dde...5aa60657013edaf758f02c04f615468ee218cfb7

>---------------------------------------------------------------

commit 5aa60657013edaf758f02c04f615468ee218cfb7
Author: Ryan Curtin <ryan at ratml.org>
Date:   Wed Oct 12 22:34:41 2016 -0400

    Fix failing HDF5 tests (handle old Armadillo bug that was probably my fault anyway).


>---------------------------------------------------------------

5aa60657013edaf758f02c04f615468ee218cfb7
 src/mlpack/tests/load_save_test.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/mlpack/tests/load_save_test.cpp b/src/mlpack/tests/load_save_test.cpp
index 9cf7cb6..5c9a0b8 100644
--- a/src/mlpack/tests/load_save_test.cpp
+++ b/src/mlpack/tests/load_save_test.cpp
@@ -518,6 +518,12 @@ BOOST_AUTO_TEST_CASE(SavePGMBinaryTest)
   remove("test_file.pgm");
 }
 
+// Don't perform any HDF5 tests on Armadillo 4.300-4.400 (inclusive).  A bug
+// causes loading to fail.
+#if ((ARMA_VERSION_MAJOR == 4) && \
+        (ARMA_VERSION_MINOR < 300 || ARMA_VERSION_MINOR > 400)) || \
+    (ARMA_VERSION_MAJOR >= 5)
+
 #if defined(ARMA_USE_HDF5)
 /**
  * Make sure load as HDF5 is successful.
@@ -650,6 +656,8 @@ BOOST_AUTO_TEST_CASE(NoHDF5Test)
 }
 #endif
 
+#endif
+
 /**
  * Test normalization of labels.
  */