More fixes for unused variable

13 files changed, 18 insertions, 6 deletions

diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 0a187ef..acdb8af 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -35,7 +35,8 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
-#include "h5cpputil.h"  // C++ utilility header file
+#include "h5test.h"
+#include "h5cpputil.h"    // C++ utilility header file
 
 const H5std_string      FILE1("dataset.h5");
 const H5std_string      DSET_DEFAULT_NAME("default");
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
index 3653b32..6fceb5b 100644
--- a/c++/test/tarray.cpp
+++ b/c++/test/tarray.cpp
@@ -29,6 +29,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 const H5std_string    FILENAME("tarray.h5");
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 25b5ff8..80c02b6 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -30,6 +30,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 const H5std_string      FILE_BASIC("tattr_basic.h5");
@@ -1134,7 +1135,6 @@ static void test_attr_mult_read()
 static void test_attr_delete()
 {
     H5std_string  attr_name; // Buffer for attribute names
-    int ii;
 
     // Output message about test being performed
     SUBTEST("Removing Attribute Function");
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index ce2d061..7eb61ac 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -29,6 +29,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 /* Number of elements in each test */
diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
index 0a60a86..a712e21 100644
--- a/c++/test/tdspl.cpp
+++ b/c++/test/tdspl.cpp
@@ -30,6 +30,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 const H5std_string FILENAME("tdatatransform.h5");
diff --git a/c++/test/testhdf5.cpp b/c++/test/testhdf5.cpp
index b998f76..1fd268a 100644
--- a/c++/test/testhdf5.cpp
+++ b/c++/test/testhdf5.cpp
@@ -51,6 +51,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 int
@@ -121,5 +122,8 @@ Comment out tests that are not done yet */
     if (GetTestCleanup() && !getenv("HDF5_NOCLEANUP"))
         TestCleanup();
 
+    /* Release test infrastructure */
+    TestShutdown();
+
     return (GetTestNumErrs());
 }
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index d5278d5..4567bef 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -33,6 +33,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 const hsize_t   F1_USERBLOCK_SIZE = (hsize_t)0;
@@ -850,9 +851,6 @@ static void test_file_info()
     // Output message about test being performed
     SUBTEST("File general information");
 
-    hsize_t out_threshold = 0;  // Free space section threshold to get
-    hbool_t out_persist = FALSE;// Persist free-space read
-
     try {
         // Create a file using default properties.
         H5File tempfile(FILE7, H5F_ACC_TRUNC);
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index 2e3c07c..522e19d 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -32,6 +32,7 @@
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 #define DSET_DIM1         100
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 18cd460..dcf4d4c 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -35,6 +35,7 @@
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 #include "H5srcdir.h"   // srcdir querying header file
 
diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
index 5d2f15f..e18839f 100644
--- a/c++/test/tobject.cpp
+++ b/c++/test/tobject.cpp
@@ -29,6 +29,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 const H5std_string      FILE_OBJECTS("tobjects.h5");
@@ -336,6 +337,7 @@ static void test_open_object_header()
 
         // Create a group in the root group
         Group grp(file1.createGroup(GROUPNAME));
+        grp.close();
 
         // Commit the type inside the file
         IntType dtype(PredType::NATIVE_INT);
@@ -354,7 +356,6 @@ static void test_open_object_header()
         // Close dataset, dataspace, and group
         dset.close();
         dspace.close();
-        grp.close();
 
         // Now make sure that openObjId can open all three types of objects
         hid_t obj_grp = file1.openObjId(GROUPNAME);
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 9f43054..930e523 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -28,6 +28,7 @@
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 // File names
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 161b1c4..ce42b09 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -29,6 +29,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 /*
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index d5f2afe..f089ec9 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -31,6 +31,7 @@ using std::endl;
 #include "H5Cpp.h"      // C++ API header file
 using namespace H5;
 
+#include "h5test.h"
 #include "h5cpputil.h"  // C++ utilility header file
 
 // Data file used in most test functions