diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2001-03-09 22:15:28 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2001-03-09 22:15:28 (GMT) |
| commit | f9d785f7de7413d73606ec3d58f7a07e289dd409 (patch) | |
| tree | 2aae2f6589ed3a26566ad9be555e0f6811af7ce1 /c++/test/dsets.cpp | |
| parent | e5cf05cbef1b2ebaecd03dc6ff7db09785dc8efe (diff) | |
| download | hdf5-f9d785f7de7413d73606ec3d58f7a07e289dd409.zip hdf5-f9d785f7de7413d73606ec3d58f7a07e289dd409.tar.gz hdf5-f9d785f7de7413d73606ec3d58f7a07e289dd409.tar.bz2 | |
[svn-r3582]
Purpose:
Test code improvement
Description:
- Added H5_HAVE_ZLIB_H and H5_HAVE_LIBZ to dsets.cpp
- Added the use of new API Exception::getCFuncName to obtain
the name of the function where failure occurs, to various places
in the test code.
Platforms tested:
arabica (sparc-sun-solaris 2.7)
Diffstat (limited to 'c++/test/dsets.cpp')
| -rw-r--r-- | c++/test/dsets.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index b80a500..6d05f31 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -451,7 +451,7 @@ test_compression(H5File& file) DataSet* dataset = new DataSet (file.createDataSet (DSET_COMPRESS_NAME, PredType::NATIVE_INT, space1, dscreatplist)); -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -477,7 +477,7 @@ test_compression(H5File& file) } } } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -501,8 +501,8 @@ test_compression(H5File& file) //if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, xfer, points)<0) goto error; dataset->write ((void*) points, PredType::NATIVE_INT, DataSpace::ALL, DataSpace::ALL, xfer); -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -526,7 +526,7 @@ test_compression(H5File& file) if (status == -1) goto error; } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -562,7 +562,7 @@ test_compression(H5File& file) if (status == -1) goto error; } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -591,7 +591,7 @@ test_compression(H5File& file) if (status == -1) goto error; } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -634,7 +634,7 @@ test_compression(H5File& file) } } } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -648,7 +648,7 @@ test_compression(H5File& file) */ TESTING("compression (app-defined method)"); - // BMR: not sure how to handle this yet??? + // BMR: not sure how to handle this yet if (H5Zregister (H5Z_BOGUS, DSET_BOGUS_NAME, bogus)<0) goto error; if (H5Pset_filter (dscreatplist.getId(), H5Z_BOGUS, 0, 0, NULL)<0) goto error; dscreatplist.setFilter (H5Z_BOGUS, 0, 0, NULL); |