From ac72823bc2a538be8365854a2d3c6f42cf1d5b62 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 30 Apr 2016 22:18:00 -0500 Subject: [svn-r29844] Description: Minor rearrangements, to align with revise_chunks branch Tested on: MacOSX/64 10.11.4 (amazon) w/serial, parallel & production (h5committest forthcoming) --- MANIFEST | 12 ++++++------ test/Makefile.am | 20 +++++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/MANIFEST b/MANIFEST index b8853d6..ce86d6e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2369,21 +2369,23 @@ ./hl/test/COPYING ./hl/test/H5srcdir_str.h.in ./hl/test/Makefile.am +./hl/test/dectris_hl_perf.c ./hl/test/dsdata.txt ./hl/test/dslat.txt ./hl/test/dslon.txt ./hl/test/dtype_file.txt ./hl/test/dtype_file_readable.txt ./hl/test/earth.pal +./hl/test/gen_test_ds.c ./hl/test/h5hltest.h -./hl/test/image8.txt ./hl/test/image24pixel.txt ./hl/test/image24plane.txt +./hl/test/image8.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_ds_be.h5 +./hl/test/test_ds_le.h5 ./hl/test/test_dset_opt.c ./hl/test/test_file_image.c ./hl/test/test_image.c @@ -2391,11 +2393,9 @@ ./hl/test/test_packet.c ./hl/test/test_packet_vlen.c ./hl/test/test_table.c -./hl/test/test_ds_le.h5 -./hl/test/test_ds_be.h5 -./hl/test/test_table_le.h5 ./hl/test/test_table_be.h5 ./hl/test/test_table_cray.h5 +./hl/test/test_table_le.h5 ./hl/test/usa.wri # tools diff --git a/test/Makefile.am b/test/Makefile.am index 7e3a385..9bc6e08 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -23,7 +23,11 @@ include $(top_srcdir)/config/commence.am AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src -# Test script for error_test and err_compat +# Test scripts-- +# testerror.sh: err_compat, error_test +# testlibinfo.sh: +# testcheck_version.sh: tcheck_version +# tetlinks_env.sh: links_env TEST_SCRIPT = testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) links_env$(EXEEXT) if HAVE_SHARED_CONDITIONAL @@ -46,13 +50,16 @@ TEST_PROG= testhdf5 cache cache_api cache_tagging lheap ohdr stab gheap \ getname vfd ntypes dangle dtransform reserved cross_read \ freespace mf vds file_image unregister -# 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. +# 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. # tcheck_version is used by testcheck_version.sh. +# links_env is used by testlinks_env.sh # 'make check' doesn't run them directly, so they are not included in TEST_PROG. # Also build testmeta, which is used for timings test. It builds quickly, # and this lets automake keep all its test programs in one place. -check_PROGRAMS=$(TEST_PROG) error_test err_compat tcheck_version testmeta links_env +check_PROGRAMS=$(TEST_PROG) error_test err_compat tcheck_version \ + testmeta \ + links_env if HAVE_SHARED_CONDITIONAL check_PROGRAMS+= plugin endif @@ -128,7 +135,8 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offse max_compact_dataset.h5 simple.h5 set_local.h5 random_chunks.h5 \ huge_chunks.h5 chunk_cache.h5 big_chunk.h5 chunk_fast.h5 chunk_expand.h5 \ chunk_fixed.h5 copy_dcpl_newfile.h5 partial_chunks.h5 layout_extend.h5 \ - zero_chunk.h5 chunk_single.h5 storage_size.h5 dls_01_strings.h5 \ + zero_chunk.h5 chunk_single.h5 \ + storage_size.h5 dls_01_strings.h5 \ extend.h5 istore.h5 extlinks*.h5 frspace.h5 links*.h5 \ sys_file1 tfile[1-7].h5 th5s[1-4].h5 lheap.h5 fheap.h5 ohdr.h5 \ stab.h5 extern_[1-5].h5 extern_[1-4][rw].raw gheap[0-4].h5 \ @@ -152,7 +160,6 @@ CHECK_CLEANFILES+=accum.h5 cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offse 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_virt.h5 vds_dapl.h5 vds_src_[0-1].h5 - # Sources for testhdf5 executable testhdf5_SOURCES=testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \ tgenprop.c th5o.c th5s.c tcoords.c theap.c tid.c titerate.c tmeta.c tmisc.c \ @@ -161,5 +168,4 @@ testhdf5_SOURCES=testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \ # Temporary files. DISTCLEANFILES=testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh test_plugin.sh - include $(top_srcdir)/config/conclude.am -- cgit v0.12