From 1578b261033d470575420c0a35f26734ec74d359 Mon Sep 17 00:00:00 2001 From: MuQun Yang Date: Thu, 15 Feb 2001 22:42:03 -0500 Subject: [svn-r3418] Purpose: add contents to compile h4toh5test.c Description: solution: handled similar as h5dumptst.c Platforms tested: Linux(eirene), sun 5.7(arabica) --- tools/Makefile.in | 7 ++++-- tools/testh4toh5.sh | 61 +++++++++++++++-------------------------------------- 2 files changed, 22 insertions(+), 46 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index b5507e5..c9a8cd4 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -24,7 +24,7 @@ LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir) LIB=libh5tools.la LIBHDF5=../src/libhdf5.la PUB_PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@ @H4TOH5@ @PDB2HDF@ -PROGS=$(PUB_PROGS) $(TEST_PROGS) h5dumptst +PROGS=$(PUB_PROGS) $(TEST_PROGS) h5dumptst h4toh5test ## Source and object files for the library; do not install LIB_SRC=h5tools.c @@ -39,7 +39,7 @@ H4TOH5_HDR=h4toh5main.h h4toh5util.h ## Source and object files for programs... PROG_SRC=h5debug.c h5import.c h5ls.c h5repart.c h5dump.c h5toh4.c \ - h5dumptst.c pdb2hdf.c talign.c $(H4TOH5_SRC) + h5dumptst.c h4toh5test.c pdb2hdf.c talign.c $(H4TOH5_SRC) PROG_OBJ=$(PROG_SRC:.c=.lo) PRIVATE_HDR=h5tools.h $(H4TOH5_HDR) @@ -75,6 +75,9 @@ h5toh4: h5toh4.lo h5dumptst: h5dumptst.lo @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5dumptst.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) +h4toh5test: h4toh5test.lo + @$(LT_LINK_EXE) $(CFLAGS) -o $@ h4toh5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + h4toh5: $(H4TOH5_OBJ) @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(H4TOH5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) diff --git a/tools/testh4toh5.sh b/tools/testh4toh5.sh index 8d14770..658fb9d 100755 --- a/tools/testh4toh5.sh +++ b/tools/testh4toh5.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2001 National Center for Supercomputing Applications. +# Copyright (C) 1997 National Center for Supercomputing Applications. # All rights reserved. # # Test script for the h4toh5 tests. @@ -213,50 +213,23 @@ $RM $OUTDIR/*.hdf $OUTDIR/*.tmp # $RM $OUTDIR/*.tmp -CONVERT vg.hdf vg.h5 -CONVERT anfile.hdf anfile.h5 -CONVERT anno_obj.hdf anno_obj.h5 -CONVERT image_attr.hdf image_attr.h5 +CONVERT anno_test.hdf anno_test.h5 +CONVERT gr_typ_test.hdf gr_typ_test.h5 +CONVERT grnameclash_test.hdf grnameclash_test.h5 +CONVERT image_attr_test.hdf image_attr_test.h5 #CONVERT image_maxsize.hdf image_maxsize.h5 -CONVERT image_pal.hdf image_pal.h5 -CONVERT image_uint16.hdf image_uint16.h5 -CONVERT image_uint161.hdf image_uint161.h5 -CONVERT image_uint32.hdf image_uint32.h5 -CONVERT image_uint321.hdf image_uint321.h5 -CONVERT image_uint8.hdf image_uint8.h5 -CONVERT image_uint81.hdf image_uint81.h5 -CONVERT sds_dimsca_data.hdf sds_dimsca_data.h5 -CONVERT sds_dimscaunl_data.hdf sds_dimscaunl_data.h5 -#CONVERT sds_maxdim.hdf sds_maxdim.h5 -#CONVERT sds_maxdimsizedata.hdf sds_maxdimsizedata.h5 -CONVERT sds_typattr.hdf sds_typattr.h5 -CONVERT sds_typchar8.hdf sds_typchar8.h5 -CONVERT sds_typchunk_comp.hdf sds_typchunk_comp.h5 -CONVERT sds_typfloat32.hdf sds_typfloat32.h5 -CONVERT sds_typfloat64.hdf sds_typfloat64.h5 -CONVERT sds_typnfloat32.hdf sds_typnfloat32.h5 -CONVERT sds_typnfloat64.hdf sds_typnfloat64.h5 -CONVERT sds_typint16.hdf sds_typint16.h5 -CONVERT sds_typint32.hdf sds_typint32.h5 -CONVERT sds_typint8.hdf sds_typint8.h5 -CONVERT sds_typlint16.hdf sds_typlint16.h5 -CONVERT sds_typlint32.hdf sds_typlint32.h5 -CONVERT sds_typlint8.hdf sds_typlint8.h5 -CONVERT sds_typluint16.hdf sds_typluint16.h5 -CONVERT sds_typluint32.hdf sds_typluint32.h5 -CONVERT sds_typluint8.hdf sds_typluint8.h5 -CONVERT sds_typuint16.hdf sds_typuint16.h5 -CONVERT sds_typuint32.hdf sds_typuint32.h5 -CONVERT sds_typuint8.hdf sds_typuint8.h5 -CONVERT vdata_attrtest.hdf vdata_attrtest.h5 -CONVERT vdata_typtest.hdf vdata_typtest.h5 -CONVERT vg_attrtest.hdf vg_attrtest.h5 -CONVERT vg_hl.hdf vg_hl.h5 -CONVERT vg_loop.hdf vg_loop.h5 -CONVERT vg_nameclash.hdf vg_nameclash.h5 -CONVERT vg_nameclash2.hdf vg_nameclash2.h5 -CONVERT vg_simple.hdf vg_simple.h5 - +CONVERT ras_24_test.hdf ras_24_test.h5 +CONVERT ras_8_test.hdf ras_8_test.h5 +CONVERT sds_attr_test.hdf sds_attr_test.h5 +CONVERT sds_dim_test.hdf sds_dim_test.h5 +CONVERT sds_typ_test.hdf sds_typ_test.h5 +CONVERT sdsnameclash_test.hdf sdsnameclash_test.h5 +CONVERT vdata_test.hdf vdata_test.h5 +CONVERT vdnameclash_test.hdf vdnameclash_test.h5 +CONVERT vg_hl_test.hdf vg_hl_test.h5 +CONVERT vg_loop_test.hdf vg_loop_test.h5 +CONVERT vgnameclash_test.hdf vgnameclash_test.h5 +CONVERT vg_all_test.hdf vg_all_test.h5 # # Again, the test for conversion are the same as the first set of test. # Here, multiple conversion are done on HDF4 files at one time. -- cgit v0.12