summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2006-10-05 19:46:45 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2006-10-05 19:46:45 (GMT)
commitc13697362a1bfa8f3a7e466f592d6baa6f925e12 (patch)
tree67bf3f3c581d096cbe5c34ba49b80b6475fddc47
parent40250f05a38b9fe2f17b27799a694ea5fc69468e (diff)
downloadhdf5-c13697362a1bfa8f3a7e466f592d6baa6f925e12.zip
hdf5-c13697362a1bfa8f3a7e466f592d6baa6f925e12.tar.gz
hdf5-c13697362a1bfa8f3a7e466f592d6baa6f925e12.tar.bz2
[svn-r12722]
added new tests for h5copy script, generated in the test file generator program
-rw-r--r--tools/h5copy/h5copygentest.c89
-rw-r--r--tools/h5copy/testh5copy.sh7
-rw-r--r--tools/testfiles/h5copytst.h5bin6192 -> 6464 bytes
3 files changed, 91 insertions, 5 deletions
diff --git a/tools/h5copy/h5copygentest.c b/tools/h5copy/h5copygentest.c
index f4695fd..3fdc57d 100644
--- a/tools/h5copy/h5copygentest.c
+++ b/tools/h5copy/h5copygentest.c
@@ -17,9 +17,12 @@
*/
#include "hdf5.h"
-#define FILENAME "h5copytst.h5"
-#define DATASET_SIMPLE "simple"
-#define DATASET_CHUNK "chunk"
+#define FILENAME "h5copytst.h5"
+#define DATASET_SIMPLE "simple"
+#define DATASET_CHUNK "chunk"
+#define DATASET_COMPACT "compact"
+#define DATASET_COMPOUND "compound"
+
/*-------------------------------------------------------------------------
@@ -84,6 +87,84 @@ static void gent_chunked_dataset(hid_t fid)
/*-------------------------------------------------------------------------
+ * Function: gent_compact_dataset
+ *
+ * Purpose: Generate a compact dataset in FID
+ *
+ *-------------------------------------------------------------------------
+ */
+static void gent_compact_dataset(hid_t fid)
+{
+ hid_t sid, did, pid;
+ hsize_t dims[1] = {6};
+ int buf[6] = {1,2,3,4,5,6};
+
+ /* create dataspace */
+ sid = H5Screate_simple(1, dims, NULL);
+
+ /* create property plist for chunk*/
+ pid = H5Pcreate(H5P_DATASET_CREATE);
+ H5Pset_layout (pid,H5D_COMPACT);
+
+ /* create dataset */
+ did = H5Dcreate(fid, DATASET_COMPACT, H5T_NATIVE_INT, sid, pid);
+
+ /* write */
+ H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
+
+ /* close */
+ H5Sclose(sid);
+ H5Dclose(did);
+ H5Pclose(pid);
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: gent_compound_dataset
+ *
+ * Purpose: Generate a compound dataset in FID
+ *
+ *-------------------------------------------------------------------------
+ */
+static void gent_compound_dataset(hid_t fid)
+{
+ typedef struct s_t
+ {
+ char str1[20];
+ char str2[20];
+ } s_t;
+ hid_t sid, did, tid_c, tid_s;
+ hsize_t dims[1] = {2};
+ s_t buf[2] = {{"str1","str2"},{"str3","str4"}};
+
+ /* create dataspace */
+ sid = H5Screate_simple(1, dims, NULL);
+
+ /* create a compound type */
+ tid_c = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+ tid_s = H5Tcopy (H5T_C_S1);
+ H5Tset_size (tid_s, 20);
+
+ H5Tinsert (tid_c, "str1", HOFFSET(s_t,str1), tid_s);
+ H5Tinsert (tid_c, "str2", HOFFSET(s_t,str2), tid_s);
+
+ /* create dataset */
+ did = H5Dcreate(fid, DATASET_COMPOUND, tid_c, sid, H5P_DEFAULT);
+
+ /* write */
+ H5Dwrite(did, tid_c, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
+
+ /* close */
+ H5Sclose(sid);
+ H5Dclose(did);
+ H5Tclose(tid_c);
+ H5Tclose(tid_s);
+}
+
+
+
+
+/*-------------------------------------------------------------------------
* Function: main
*
*-------------------------------------------------------------------------
@@ -98,6 +179,8 @@ int main(void)
gent_simple_dataset(fid);
gent_chunked_dataset(fid);
+ gent_compact_dataset(fid);
+ gent_compound_dataset(fid);
H5Fclose(fid);
return 0;
diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh
index eef1834..d376461 100644
--- a/tools/h5copy/testh5copy.sh
+++ b/tools/h5copy/testh5copy.sh
@@ -120,8 +120,11 @@ H5DIFFTEST()
### T H E T E S T S ###
##############################################################################
-TOOLTEST -i $TESTFILE -o $FILEOUT -v -s simple -d simple
-TOOLTEST -i $TESTFILE -o $FILEOUT -v -s chunk -d chunk
+TOOLTEST -i $TESTFILE -o $FILEOUT -v -s simple -d simple
+TOOLTEST -i $TESTFILE -o $FILEOUT -v -s chunk -d chunk
+TOOLTEST -i $TESTFILE -o $FILEOUT -v -s compact -d compact
+TOOLTEST -i $TESTFILE -o $FILEOUT -v -s compound -d compound
+
diff --git a/tools/testfiles/h5copytst.h5 b/tools/testfiles/h5copytst.h5
index 9ea449a..9d44bd7 100644
--- a/tools/testfiles/h5copytst.h5
+++ b/tools/testfiles/h5copytst.h5
Binary files differ