summaryrefslogtreecommitdiffstats
path: root/c++/test
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2014-10-02 04:05:38 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2014-10-02 04:05:38 (GMT)
commit9c9326c7debc3b4f32602ec21cc67cfccafa6fc0 (patch)
tree5860b1568bae4fb51cd4051191e48a729e368cbc /c++/test
parent40c17513405c1056c90b7324a954df2a217efd65 (diff)
downloadhdf5-9c9326c7debc3b4f32602ec21cc67cfccafa6fc0.zip
hdf5-9c9326c7debc3b4f32602ec21cc67cfccafa6fc0.tar.gz
hdf5-9c9326c7debc3b4f32602ec21cc67cfccafa6fc0.tar.bz2
[svn-r25653] Purpose: Fixed HDFFV-4259
Description: - Used H5I_INVALID_HID instead of 0 to initialized member "id" in classes that represent HDF5 objects. For PropList, H5P_DEFAULT has to be used instead of H5I_INVALID_HID. - Added try/catch block to some dynamically allocating memory code and re-throw the bad_alloc exception with a message informing the location of the failure. (merged from trunk-r25640) Purpose: Fixed HDFFV-8852 Description: H5F_ACC_CREAT was included in the C++ API while the C library doesn't allow it yet. Possibly, in the future, but not now. In addition, the two flags H5F_ACC_RDONLY and H5F_ACC_RDWR were missing from the documentation, causing confusion that appending is not supported. Solution: - Removed H5F_ACC_CREAT from the function until the C library support it - Added H5F_ACC_RDONLY and H5F_ACC_RDWR to the comments to update the documentation (merged from trunk-r25632) Platforms tested: Linux/ppc64 (ostrich) Linux/32 2.6 (jam) SunOS 5.11 (emu)
Diffstat (limited to 'c++/test')
-rw-r--r--c++/test/dsets.cpp1
-rw-r--r--c++/test/tfile.cpp2
-rw-r--r--c++/test/th5s.cpp4
-rw-r--r--c++/test/tlinks.cpp2
4 files changed, 5 insertions, 4 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index d1ced1d..fc0ea3a 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -1083,6 +1083,7 @@ void test_dset()
// Close the file before testing data size.
file.close();
+
nerrors += test_datasize(fapl) <0 ? 1:0;
}
catch (Exception E)
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 0f4ea33..2bc0d01 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -622,7 +622,7 @@ extern "C"
void test_file()
{
// Output message about test being performed
- MESSAGE(5, ("Testing File I/O operations\n"));
+ MESSAGE(5, ("Testing File I/O Operations\n"));
test_file_create(); // Test file creation (also creation templates)
test_file_open(); // Test file opening
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index cfdeb1f..b7a39b4 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -317,7 +317,7 @@ static void test_h5s_scalar_read()
SUBTEST("Scalar Dataspace Reading");
try {
- // Create file
+ // Open file
H5File fid1(DATAFILE, H5F_ACC_RDWR);
// Create a dataset
@@ -506,7 +506,7 @@ static void test_h5s_compound_scalar_read()
// Output message about test being performed
SUBTEST("Compound Dataspace Reading");
try {
- // Create file
+ // Open file
H5File fid1(DATAFILE, H5F_ACC_RDWR);
// Create a dataset
diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
index fca5918..291b649 100644
--- a/c++/test/tlinks.cpp
+++ b/c++/test/tlinks.cpp
@@ -15,7 +15,7 @@
/*****************************************************************************
FILE
tlinks.cpp - HDF5 C++ testing functionalities associated with the
- C attribute interface (H5L)
+ C link interface (H5L)
***************************************************************************/