summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-06-04 19:46:50 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-06-04 19:46:50 (GMT)
commitfad77fd2c29615f57f05547f41819f77d828b2d8 (patch)
tree71f7e7068bfde3289409e07ca31d0d492a1af18f
parent5d12a79db20305b7c08e505a683a4c1e38e9039a (diff)
downloadhdf5-fad77fd2c29615f57f05547f41819f77d828b2d8.zip
hdf5-fad77fd2c29615f57f05547f41819f77d828b2d8.tar.gz
hdf5-fad77fd2c29615f57f05547f41819f77d828b2d8.tar.bz2
[svn-r27150] Added an empty VDS testfile generator to tools/misc directory.
test/Makefile.in was updated due to changes in the Makefile.am file that missed a reconfigure. The changes just added a few VDS test files to the deletion list. Note that there are trace issues with a new VDS struct that show up when running bin/reconfigure. I reverted these for fixing at a future date. Tested on: jam
-rw-r--r--test/Makefile.in3
-rw-r--r--tools/misc/Makefile.am4
-rw-r--r--tools/misc/Makefile.in27
-rw-r--r--tools/misc/vds_gentest.c23
4 files changed, 49 insertions, 8 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 3204bd3..cd79959 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1095,7 +1095,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 accum.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 \
- unregister_filter_1.h5 unregister_filter_2.h5 vds_[1-2].h5
+ unregister_filter_1.h5 unregister_filter_2.h5 vds_virt.h5 \
+ vds_src_[0-1].h5
# Test script for error_test and err_compat
TEST_SCRIPT = testerror.sh testlibinfo.sh testcheck_version.sh \
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index 882f8f2..7573204 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -23,8 +23,8 @@ include $(top_srcdir)/config/commence.am
# Include src directory
AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
-#test script and program
-TEST_PROG=h5repart_gentest talign
+#test scripts and programs
+TEST_PROG=h5repart_gentest talign vds_gentest
TEST_SCRIPT=testh5repart.sh testh5mkgrp.sh
check_PROGRAMS=$(TEST_PROG) repart_test
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 1b8e0eb..d579e24 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -116,7 +116,8 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h
CONFIG_CLEAN_FILES = h5cc testh5mkgrp.sh testh5repart.sh
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
-am__EXEEXT_1 = h5repart_gentest$(EXEEXT) talign$(EXEEXT)
+am__EXEEXT_1 = h5repart_gentest$(EXEEXT) talign$(EXEEXT) \
+ vds_gentest$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
h5debug_SOURCES = h5debug.c
h5debug_OBJECTS = h5debug.$(OBJEXT)
@@ -155,6 +156,10 @@ talign_SOURCES = talign.c
talign_OBJECTS = talign.$(OBJEXT)
talign_LDADD = $(LDADD)
talign_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+vds_gentest_SOURCES = vds_gentest.c
+vds_gentest_OBJECTS = vds_gentest.$(OBJEXT)
+vds_gentest_LDADD = $(LDADD)
+vds_gentest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -218,9 +223,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = h5debug.c h5mkgrp.c h5repart.c h5repart_gentest.c \
- repart_test.c talign.c
+ repart_test.c talign.c vds_gentest.c
DIST_SOURCES = h5debug.c h5mkgrp.c h5repart.c h5repart_gentest.c \
- repart_test.c talign.c
+ repart_test.c talign.c vds_gentest.c
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -695,8 +700,8 @@ TRACE = perl $(top_srcdir)/bin/trace
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \
../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
-#test script and program
-TEST_PROG = h5repart_gentest talign
+#test scripts and programs
+TEST_PROG = h5repart_gentest talign vds_gentest
TEST_SCRIPT = testh5repart.sh testh5mkgrp.sh
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5repart$(EXEEXT) h5mkgrp$(EXEEXT)
@@ -863,6 +868,10 @@ repart_test$(EXEEXT): $(repart_test_OBJECTS) $(repart_test_DEPENDENCIES) $(EXTRA
talign$(EXEEXT): $(talign_OBJECTS) $(talign_DEPENDENCIES) $(EXTRA_talign_DEPENDENCIES)
@rm -f talign$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(talign_OBJECTS) $(talign_LDADD) $(LIBS)
+
+vds_gentest$(EXEEXT): $(vds_gentest_OBJECTS) $(vds_gentest_DEPENDENCIES) $(EXTRA_vds_gentest_DEPENDENCIES)
+ @rm -f vds_gentest$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(vds_gentest_OBJECTS) $(vds_gentest_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
@@ -911,6 +920,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repart_gentest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repart_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/talign.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vds_gentest.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1135,6 +1145,13 @@ talign.log: talign$(EXEEXT)
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+vds_gentest.log: vds_gentest$(EXEEXT)
+ @p='vds_gentest$(EXEEXT)'; \
+ b='vds_gentest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
.sh.log:
@p='$<'; \
$(am__set_b); \
diff --git a/tools/misc/vds_gentest.c b/tools/misc/vds_gentest.c
new file mode 100644
index 0000000..cd62724
--- /dev/null
+++ b/tools/misc/vds_gentest.c
@@ -0,0 +1,23 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group. *
+ * Copyright by the Board of Trustees of the University of Illinois. *
+ * All rights reserved. *
+ * *
+ * This file is part of HDF5. The full HDF5 copyright notice, including *
+ * terms governing use, modification, and redistribution, is contained in *
+ * the files COPYING and Copyright.html. COPYING can be found at the root *
+ * of the source code distribution tree; Copyright.html can be found at the *
+ * root level of an installed copy of the electronic HDF5 document set and *
+ * is linked from the top-level documents page. It can also be found at *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have *
+ * access to either file, you may request a copy from help@hdfgroup.org. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <stdlib.h>
+
+int
+main(int argc, char *argv[])
+{
+ return EXIT_SUCCESS;
+} /* end main */
+