summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2002-07-17 16:10:46 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2002-07-17 16:10:46 (GMT)
commitceba60418cdeb53eae7d953ec6fc9cc1f58efff1 (patch)
treedff97a1ffc292f5b479871b9c1c82106f30db0e5 /c++
parent23670c0cf63d08c4f78ea3e8f157bf58aab92b5a (diff)
downloadhdf5-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 'c++')
-rw-r--r--c++/test/dsets.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 2876bb2..a5b66b5 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -445,7 +445,7 @@ test_compression(H5File& file)
DataSet* dataset = new DataSet (file.createDataSet
(DSET_COMPRESS_NAME, PredType::NATIVE_INT, space1, dscreatplist));
-#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)
+#ifdef H5_HAVE_COMPRESSION
PASSED();
#else
SKIPPED();
@@ -471,7 +471,7 @@ test_compression(H5File& file)
}
}
}
-#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)
+#ifdef H5_HAVE_COMPRESSION
PASSED();
#else
SKIPPED();
@@ -496,7 +496,7 @@ 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);
-#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)
+#ifdef H5_HAVE_COMPRESSION
PASSED();
#else
SKIPPED();
@@ -520,7 +520,7 @@ test_compression(H5File& file)
if (status == -1) goto error;
}
-#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)
+#ifdef H5_HAVE_COMPRESSION
PASSED();
#else
SKIPPED();
@@ -556,7 +556,7 @@ test_compression(H5File& file)
if (status == -1) goto error;
}
-#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)
+#ifdef H5_HAVE_COMPRESSION
PASSED();
#else
SKIPPED();
@@ -585,7 +585,7 @@ test_compression(H5File& file)
if (status == -1) goto error;
}
-#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)
+#ifdef H5_HAVE_COMPRESSION
PASSED();
#else
SKIPPED();
@@ -628,7 +628,7 @@ test_compression(H5File& file)
}
}
}
-#if defined(H5_HAVE_COMPRESS2) && defined(H5_HAVE_ZLIB_H) && defined(H5_HAVE_LIBZ)
+#ifdef H5_HAVE_COMPRESSION
PASSED();
#else
SKIPPED();