summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2013-06-01 18:35:04 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2013-06-01 18:35:04 (GMT)
commit30cd06b6e1cdbd1d367de5a3f40a23a339d4b687 (patch)
tree54c4701438e920fe22cd013e948d2e3eed76dd11 /test
parent39a3d4aa3e8441e886a3eb44c1040aad47886537 (diff)
downloadhdf5-30cd06b6e1cdbd1d367de5a3f40a23a339d4b687.zip
hdf5-30cd06b6e1cdbd1d367de5a3f40a23a339d4b687.tar.gz
hdf5-30cd06b6e1cdbd1d367de5a3f40a23a339d4b687.tar.bz2
[svn-r23726] Changed use case programs to more descriptive names.
usecase1_7.c -> use_append_chunk; usecase_common.c -> use_common.c; usecase.h -> use.h. MANIFEST updated with new names. Tested: h5committest.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am6
-rw-r--r--test/Makefile.in32
-rw-r--r--test/use.h (renamed from test/usecase.h)0
-rw-r--r--test/use_append_chunk.c (renamed from test/usecase1_7.c)6
-rw-r--r--test/use_common.c (renamed from test/usecase_common.c)2
5 files changed, 25 insertions, 21 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 2bb4e5a..f3932ed 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -51,7 +51,7 @@ TEST_PROG= testhdf5 lheap ohdr stab gheap cache cache_api cache_tagging \
bin_PROGRAMS=swmr_generator swmr_reader swmr_writer swmr_remove_reader \
swmr_remove_writer swmr_addrem_writer swmr_sparse_reader swmr_sparse_writer \
- usecase1_7
+ use_append_chunk
# List programs to be built when testing here. error_test and err_compat are
# built at the same time as the other tests, but executed by testerror.sh.
@@ -159,7 +159,7 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 \
new_multi_file_v16-r.h5 new_multi_file_v16-s.h5 \
split_get_file_image_test-m.h5 split_get_file_image_test-r.h5 \
file_image_core_test.h5.copy \
- swmr_data.h5 usecase1_7.h5 \
+ swmr_data.h5 use_append_chunk.h5 \
flushrefresh.h5 flushrefresh_VERIFICATION_START \
flushrefresh_VERIFICATION_CHECKPOINT1 flushrefresh_VERIFICATION_CHECKPOINT2 \
flushrefresh_VERIFICATION_DONE
@@ -171,7 +171,7 @@ testhdf5_SOURCES=testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \
tvlstr.c tvltypes.c
# Sources for Use Cases
-usecase1_7_SOURCES=usecase1_7.c usecase_common.c
+use_append_chunk_SOURCES=use_append_chunk.c use_common.c
# Temporary files.
DISTCLEANFILES=testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh test_plugin.sh \
diff --git a/test/Makefile.in b/test/Makefile.in
index 4fb09d1..d31ff70 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -82,7 +82,7 @@ bin_PROGRAMS = swmr_generator$(EXEEXT) swmr_reader$(EXEEXT) \
swmr_writer$(EXEEXT) swmr_remove_reader$(EXEEXT) \
swmr_remove_writer$(EXEEXT) swmr_addrem_writer$(EXEEXT) \
swmr_sparse_reader$(EXEEXT) swmr_sparse_writer$(EXEEXT) \
- usecase1_7$(EXEEXT)
+ use_append_chunk$(EXEEXT)
check_PROGRAMS = $(am__EXEEXT_1) error_test$(EXEEXT) \
err_compat$(EXEEXT) tcheck_version$(EXEEXT) testmeta$(EXEEXT) \
links_env$(EXEEXT) flushrefresh$(EXEEXT) $(am__EXEEXT_2)
@@ -532,10 +532,11 @@ unlink_SOURCES = unlink.c
unlink_OBJECTS = unlink.$(OBJEXT)
unlink_LDADD = $(LDADD)
unlink_DEPENDENCIES = libh5test.la $(LIBHDF5)
-am_usecase1_7_OBJECTS = usecase1_7.$(OBJEXT) usecase_common.$(OBJEXT)
-usecase1_7_OBJECTS = $(am_usecase1_7_OBJECTS)
-usecase1_7_LDADD = $(LDADD)
-usecase1_7_DEPENDENCIES = libh5test.la $(LIBHDF5)
+am_use_append_chunk_OBJECTS = use_append_chunk.$(OBJEXT) \
+ use_common.$(OBJEXT)
+use_append_chunk_OBJECTS = $(am_use_append_chunk_OBJECTS)
+use_append_chunk_LDADD = $(LDADD)
+use_append_chunk_DEPENDENCIES = libh5test.la $(LIBHDF5)
vfd_SOURCES = vfd.c
vfd_OBJECTS = vfd.$(OBJEXT)
vfd_LDADD = $(LDADD)
@@ -594,7 +595,7 @@ SOURCES = $(libdynlib1_la_SOURCES) $(libdynlib2_la_SOURCES) \
swmr_generator.c swmr_reader.c swmr_remove_reader.c \
swmr_remove_writer.c swmr_sparse_reader.c swmr_sparse_writer.c \
swmr_writer.c tcheck_version.c $(testhdf5_SOURCES) testmeta.c \
- $(ttsafe_SOURCES) unlink.c $(usecase1_7_SOURCES) vfd.c
+ $(ttsafe_SOURCES) unlink.c $(use_append_chunk_SOURCES) vfd.c
DIST_SOURCES = $(am__libdynlib1_la_SOURCES_DIST) \
$(am__libdynlib2_la_SOURCES_DIST) \
$(am__libdynlib3_la_SOURCES_DIST) $(libh5test_la_SOURCES) \
@@ -616,7 +617,7 @@ DIST_SOURCES = $(am__libdynlib1_la_SOURCES_DIST) \
swmr_generator.c swmr_reader.c swmr_remove_reader.c \
swmr_remove_writer.c swmr_sparse_reader.c swmr_sparse_writer.c \
swmr_writer.c tcheck_version.c $(testhdf5_SOURCES) testmeta.c \
- $(ttsafe_SOURCES) unlink.c $(usecase1_7_SOURCES) vfd.c
+ $(ttsafe_SOURCES) unlink.c $(use_append_chunk_SOURCES) vfd.c
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -938,7 +939,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog accum.h5 cmpd_dset.h5 \
earray.h5 efc[0-5].h5 log_vfd_out.log new_multi_file_v16-r.h5 \
new_multi_file_v16-s.h5 split_get_file_image_test-m.h5 \
split_get_file_image_test-r.h5 file_image_core_test.h5.copy \
- swmr_data.h5 flushrefresh.h5 flushrefresh_VERIFICATION_START \
+ swmr_data.h5 use_append_chunk.h5 flushrefresh.h5 \
+ flushrefresh_VERIFICATION_START \
flushrefresh_VERIFICATION_CHECKPOINT1 \
flushrefresh_VERIFICATION_CHECKPOINT2 \
flushrefresh_VERIFICATION_DONE
@@ -947,7 +949,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
# Test script for error_test and err_compat
TEST_SCRIPT = testerror.sh testlibinfo.sh testcheck_version.sh \
testlinks_env.sh $(srcdir)/testswmr.sh testflushrefresh.sh \
- $(srcdir)/test_usecases.sh $(am__append_1)
+ $(am__append_1)
SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) \
links_env$(EXEEXT) $(am__append_2)
check_SCRIPTS = $(TEST_SCRIPT)
@@ -1005,7 +1007,7 @@ testhdf5_SOURCES = testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \
# Sources for Use Cases
-usecase1_7_SOURCES = usecase1_7.c usecase_common.c
+use_append_chunk_SOURCES = use_append_chunk.c use_common.c
# Temporary files.
DISTCLEANFILES = testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh test_plugin.sh \
@@ -1449,9 +1451,9 @@ ttsafe$(EXEEXT): $(ttsafe_OBJECTS) $(ttsafe_DEPENDENCIES) $(EXTRA_ttsafe_DEPENDE
unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES) $(EXTRA_unlink_DEPENDENCIES)
@rm -f unlink$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
-usecase1_7$(EXEEXT): $(usecase1_7_OBJECTS) $(usecase1_7_DEPENDENCIES) $(EXTRA_usecase1_7_DEPENDENCIES)
- @rm -f usecase1_7$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(usecase1_7_OBJECTS) $(usecase1_7_LDADD) $(LIBS)
+use_append_chunk$(EXEEXT): $(use_append_chunk_OBJECTS) $(use_append_chunk_DEPENDENCIES) $(EXTRA_use_append_chunk_DEPENDENCIES)
+ @rm -f use_append_chunk$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(use_append_chunk_OBJECTS) $(use_append_chunk_LDADD) $(LIBS)
vfd$(EXEEXT): $(vfd_OBJECTS) $(vfd_DEPENDENCIES) $(EXTRA_vfd_DEPENDENCIES)
@rm -f vfd$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(vfd_OBJECTS) $(vfd_LDADD) $(LIBS)
@@ -1581,8 +1583,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tvlstr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tvltypes.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usecase1_7.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usecase_common.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/use_append_chunk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/use_common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfd.Po@am__quote@
.c.o:
diff --git a/test/usecase.h b/test/use.h
index 8957ac1..8957ac1 100644
--- a/test/usecase.h
+++ b/test/use.h
diff --git a/test/usecase1_7.c b/test/use_append_chunk.c
index 604bfbc..1d23fe5 100644
--- a/test/usecase1_7.c
+++ b/test/use_append_chunk.c
@@ -61,11 +61,11 @@
* Modified:
*/
-#include "usecase.h"
+#include "use.h"
/* Global Variable definitions */
options_t UC_opts; /* Use Case Options */
-const char *progname_g="usecase1_7"; /* program name */
+const char *progname_g="use_append_chunk"; /* program name */
/* Create the skeleton use case file for testing.
* It has one 3d dataset using chunked storage.
@@ -332,6 +332,8 @@ int read_uc_file(void)
if (dims[1] != memdims[1] || dims[2] != memdims[2]){
fprintf(stderr, "dataset dimension is not as expected. Got dims=(%ld,%ld,%ld)\n",
(long)dims[0], (long)dims[1], (long)dims[2]);
+ fprintf(stderr, "But memdims=(%ld,%ld,%ld)\n",
+ (long)memdims[0], (long)memdims[1], (long)memdims[2]);
return -1;
}
diff --git a/test/usecase_common.c b/test/use_common.c
index d2d2aa5..cdbeca3 100644
--- a/test/usecase_common.c
+++ b/test/use_common.c
@@ -12,7 +12,7 @@
* access to either file, you may request a copy from help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "usecase.h"
+#include "use.h"
void
usage(const char *prog)