diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2002-07-17 16:10:46 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2002-07-17 16:10:46 (GMT) |
| commit | ceba60418cdeb53eae7d953ec6fc9cc1f58efff1 (patch) | |
| tree | dff97a1ffc292f5b479871b9c1c82106f30db0e5 /test/dsets.c | |
| parent | 23670c0cf63d08c4f78ea3e8f157bf58aab92b5a (diff) | |
| download | hdf5-ceba60418cdeb53eae7d953ec6fc9cc1f58efff1.zip hdf5-ceba60418cdeb53eae7d953ec6fc9cc1f58efff1.tar.gz hdf5-ceba60418cdeb53eae7d953ec6fc9cc1f58efff1.tar.bz2 | |
[svn-r5807] Purpose:
Update, Bug Fix, and Feature Add
Description:
- Updated how AC_{ENABLE,WITH} help messages were being generated.
Autoconf now gives you an AC_HELP_STRING macro to use to create
them.
- Fixed the problem with Linux LFS on RedHat 7.3 machines. It wasn't
finding getdents64(), so we can't rely on that being present
anymore...
- Added GPFS detection and setting.
- Updated how compression is specified. It's no longer necessary to
test for HAVE_ZLIB_H, HAVE_LIBZ, and HAVE_COMPRESS2. The one macro
{H5_}HAVE_COMPRESSION takes care of all of these.
Solution:
Changed the check for Linux LFS from looking for getdents() to
looking at the version number of the kernel (using the uname -r
command). You can still override with the --enable-linux-lfs switch
if you really believe that your <2.4 kernel has LFS support.
Platforms tested:
Linux (2.2 and 2.4)
Diffstat (limited to 'test/dsets.c')
| -rw-r--r-- | test/dsets.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/dsets.c b/test/dsets.c index 1343f22..890aa2f 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -366,14 +366,14 @@ test_compression(hid_t file) const hsize_t chunk_size[2] = {2, 25}; const hssize_t hs_offset[2] = {7, 30}; const hsize_t hs_size[2] = {4, 50}; -#if !(defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)) +#ifndef H5_HAVE_COMPRESSION const char *not_supported; #endif hsize_t i, j, n; void *tconv_buf = NULL; -#if !(defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)) +#ifndef H5_HAVE_COMPRESSION not_supported = " Deflate compression is not supported.\n" " The zlib was not found when hdf5 was configured."; #endif @@ -399,7 +399,7 @@ test_compression(hid_t file) /* Create the dataset */ if ((dataset = H5Dcreate(file, DSET_COMPRESS_NAME, H5T_NATIVE_INT, space, dc))<0) goto error; -#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) +#ifdef H5_HAVE_COMPRESSION PASSED(); #else SKIPPED(); @@ -426,7 +426,7 @@ test_compression(hid_t file) } } } -#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) +#ifdef H5_HAVE_COMPRESSION PASSED(); #else SKIPPED(); @@ -448,7 +448,7 @@ test_compression(hid_t file) if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, xfer, points)<0) goto error; -#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) +#ifdef H5_HAVE_COMPRESSION PASSED(); #else SKIPPED(); @@ -477,7 +477,7 @@ test_compression(hid_t file) } } } -#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) +#ifdef H5_HAVE_COMPRESSION PASSED(); #else SKIPPED(); @@ -517,7 +517,7 @@ test_compression(hid_t file) } } } -#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) +#ifdef H5_HAVE_COMPRESSION PASSED(); #else SKIPPED(); @@ -549,7 +549,7 @@ test_compression(hid_t file) } } } -#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) +#ifdef H5_HAVE_COMPRESSION PASSED(); #else SKIPPED(); @@ -595,7 +595,7 @@ test_compression(hid_t file) } } } -#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) +#ifdef H5_HAVE_COMPRESSION PASSED(); #else SKIPPED(); |