From 6050e7814364a78fc6d196c5b6a6e4b6e4d274ca Mon Sep 17 00:00:00 2001 From: Raymond Lu Date: Thu, 13 Dec 2012 11:13:43 -0500 Subject: [svn-r23097] I changed H5Dopen to H5Dopen2 in test/dectris_tst.c and hl/test/test_dset_opt.c. I added hl/test/dectris_hl_perf.c perform/dectris_perf.c test/dectris_tst.c Tested on koala. --- MANIFEST | 3 +++ hl/test/test_dset_opt.c | 10 +++++----- test/dectris_tst.c | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/MANIFEST b/MANIFEST index 4712b56..09f10a7 100644 --- a/MANIFEST +++ b/MANIFEST @@ -493,6 +493,7 @@ ./perform/build_h5perf_alone.sh ./perform/build_h5perf_serial_alone.sh ./perform/chunk.c +./perform/dectris_perf.c ./perform/gen_report.pl ./perform/iopipe.c ./perform/overhead.c @@ -938,6 +939,7 @@ ./test/corrupt_stab_msg.h5 ./test/cross_read.c ./test/dangle.c +./test/dectris_tst.c ./test/deflate.h5 ./test/dsets.c ./test/dt_arith.c @@ -2187,6 +2189,7 @@ ./hl/test/image24plane.txt ./hl/test/pal_rgb.h ./hl/test/sepia.pal +./hl/test/dectris_hl_perf.c ./hl/test/gen_test_ds.c ./hl/test/test_ds.c ./hl/test/test_dset_opt.c diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c index ebe28cc..0a0674b 100644 --- a/hl/test/test_dset_opt.c +++ b/hl/test/test_dset_opt.c @@ -207,7 +207,7 @@ test_direct_chunk_write (hid_t file) if(H5Dclose(dataset) < 0) goto error; - if((dataset = H5Dopen(file, DATASETNAME1, H5P_DEFAULT)) < 0) + if((dataset = H5Dopen2(file, DATASETNAME1, H5P_DEFAULT)) < 0) goto error; /* @@ -281,7 +281,7 @@ test_direct_chunk_write (hid_t file) if(H5Dclose(dataset) < 0) goto error; - if((dataset = H5Dopen(file, DATASETNAME1, H5P_DEFAULT)) < 0) + if((dataset = H5Dopen2(file, DATASETNAME1, H5P_DEFAULT)) < 0) goto error; /* Read the chunk back */ @@ -422,7 +422,7 @@ test_skip_compress_write1(hid_t file) if(H5Dclose(dataset) < 0) goto error; - if((dataset = H5Dopen(file, DATASETNAME2, H5P_DEFAULT)) < 0) + if((dataset = H5Dopen2(file, DATASETNAME2, H5P_DEFAULT)) < 0) goto error; /* @@ -664,7 +664,7 @@ test_skip_compress_write2(hid_t file) if(H5Dclose(dataset) < 0) goto error; - if((dataset = H5Dopen(file, DATASETNAME3, H5P_DEFAULT)) < 0) + if((dataset = H5Dopen2(file, DATASETNAME3, H5P_DEFAULT)) < 0) goto error; /* @@ -846,7 +846,7 @@ test_data_conv(hid_t file) if(H5Dclose(dataset) < 0) goto error; - if((dataset = H5Dopen(file, DATASETNAME4, H5P_DEFAULT)) < 0) + if((dataset = H5Dopen2(file, DATASETNAME4, H5P_DEFAULT)) < 0) goto error; /* diff --git a/test/dectris_tst.c b/test/dectris_tst.c index ccc4310..ec1c23a 100644 --- a/test/dectris_tst.c +++ b/test/dectris_tst.c @@ -180,7 +180,7 @@ main (void) if((file = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR; - if((dataset = H5Dopen(file, DATASETNAME, H5P_DEFAULT)) < 0) + if((dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT)) < 0) TEST_ERROR; /* @@ -258,7 +258,7 @@ main (void) if((file = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR; - if((dataset = H5Dopen(file, DATASETNAME, H5P_DEFAULT)) < 0) + if((dataset = H5Dopen2(file, DATASETNAME, H5P_DEFAULT)) < 0) TEST_ERROR; /* Read the chunk back */ -- cgit v0.12