From ad08120b6d393abe69778504ce914dedcc74b4c9 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 3 Jan 2001 20:32:22 -0500 Subject: [svn-r3237] Purpose: Bug fix. Description: Properly detect whether the library has compression support and skip tests (with messages) if there is no compression. Platforms tested: FreeBSD 4.2 (hawkwind) --- test/dsets.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/dsets.c b/test/dsets.c index d0ef567..4863d93 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -378,7 +378,7 @@ test_compression(hid_t file) /* Create the dataset */ if ((dataset = H5Dcreate(file, DSET_COMPRESS_NAME, H5T_NATIVE_INT, space, dc))<0) goto error; -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -405,7 +405,7 @@ test_compression(hid_t file) } } } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -427,7 +427,7 @@ test_compression(hid_t file) if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, xfer, points)<0) goto error; -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -456,7 +456,7 @@ test_compression(hid_t file) } } } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -496,7 +496,7 @@ test_compression(hid_t file) } } } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -528,7 +528,7 @@ test_compression(hid_t file) } } } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); @@ -574,7 +574,7 @@ test_compression(hid_t file) } } } -#ifdef H5_HAVE_COMPRESS2 +#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ) PASSED(); #else SKIPPED(); -- cgit v0.12