diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/.distdep | 404 | ||||
| -rw-r--r-- | test/chunk.c | 18 | ||||
| -rw-r--r-- | test/dtypes.c | 54 | ||||
| -rw-r--r-- | test/extend.c | 2 | ||||
| -rw-r--r-- | test/h5test.c | 36 | ||||
| -rw-r--r-- | test/mtime.c | 5 | ||||
| -rw-r--r-- | test/tattr.c | 7 | ||||
| -rw-r--r-- | test/th5s.c | 4 |
8 files changed, 267 insertions, 263 deletions
diff --git a/test/.distdep b/test/.distdep index 503d7a2..7da3a87 100644 --- a/test/.distdep +++ b/test/.distdep @@ -1,5 +1,5 @@ -h5test.o: \ - h5test.c \ +big.o: \ + big.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -30,8 +30,8 @@ h5test.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -big.o: \ - big.c \ +bittests.o: \ + bittests.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -62,8 +62,8 @@ big.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -bittests.o: \ - bittests.c \ +cmpd_dset.o: \ + cmpd_dset.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -94,8 +94,9 @@ bittests.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -chunk.o: \ - chunk.c \ +dsets.o: \ + dsets.c \ + h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -117,9 +118,16 @@ chunk.o: \ ../src/H5Rpublic.h \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h -cmpd_dset.o: \ - cmpd_dset.c \ + ../src/H5Tpublic.h \ + ../src/H5private.h \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5Fprivate.h \ + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h \ + ../src/H5Gprivate.h +external.o: \ + external.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -150,8 +158,8 @@ cmpd_dset.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -dsets.o: \ - dsets.c \ +fillval.o: \ + fillval.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -182,8 +190,8 @@ dsets.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -dtypes.o: \ - dtypes.c \ +flush1.o: \ + flush1.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -214,8 +222,8 @@ dtypes.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -extend.o: \ - extend.c \ +flush2.o: \ + flush2.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -246,8 +254,8 @@ extend.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -external.o: \ - external.c \ +gheap.o: \ + gheap.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -277,10 +285,17 @@ external.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ - ../src/H5Gprivate.h -fillval.o: \ - fillval.c \ - h5test.h \ + ../src/H5Gprivate.h \ + ../src/H5Bprivate.h \ + ../src/H5Eprivate.h \ + ../src/H5Iprivate.h +hyperslab.o: \ + hyperslab.c \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h +iopipe.o: \ + iopipe.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -302,16 +317,9 @@ fillval.o: \ ../src/H5Rpublic.h \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h \ - ../src/H5private.h \ - ../src/H5Tpkg.h \ - ../src/H5HGprivate.h \ - ../src/H5Fprivate.h \ - ../src/H5Rprivate.h \ - ../src/H5Tprivate.h \ - ../src/H5Gprivate.h -flush1.o: \ - flush1.c \ + ../src/H5Tpublic.h +istore.o: \ + istore.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -341,9 +349,15 @@ flush1.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ - ../src/H5Gprivate.h -flush2.o: \ - flush2.c \ + ../src/H5Gprivate.h \ + ../src/H5Bprivate.h \ + ../src/H5Dprivate.h \ + ../src/H5Oprivate.h \ + ../src/H5Sprivate.h \ + ../src/H5Zprivate.h \ + ../src/H5Iprivate.h +lheap.o: \ + lheap.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -374,8 +388,8 @@ flush2.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -gheap.o: \ - gheap.c \ +links.o: \ + links.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -405,17 +419,10 @@ gheap.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ - ../src/H5Gprivate.h \ - ../src/H5Bprivate.h \ - ../src/H5Eprivate.h \ - ../src/H5Iprivate.h -hyperslab.o: \ - hyperslab.c \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h -iopipe.o: \ - iopipe.c \ + ../src/H5Gprivate.h +mount.o: \ + mount.c \ + h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -437,9 +444,16 @@ iopipe.o: \ ../src/H5Rpublic.h \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h -istore.o: \ - istore.c \ + ../src/H5Tpublic.h \ + ../src/H5private.h \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5Fprivate.h \ + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h \ + ../src/H5Gprivate.h +ohdr.o: \ + ohdr.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -471,14 +485,13 @@ istore.o: \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h \ ../src/H5Bprivate.h \ - ../src/H5Dprivate.h \ + ../src/H5Iprivate.h \ ../src/H5Oprivate.h \ ../src/H5Sprivate.h \ ../src/H5Zprivate.h \ - ../src/H5Iprivate.h -lheap.o: \ - lheap.c \ - h5test.h \ + ../src/H5Gpkg.h +overhead.o: \ + overhead.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -500,17 +513,9 @@ lheap.o: \ ../src/H5Rpublic.h \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ - ../src/H5Tpublic.h \ - ../src/H5private.h \ - ../src/H5Tpkg.h \ - ../src/H5HGprivate.h \ - ../src/H5Fprivate.h \ - ../src/H5Rprivate.h \ - ../src/H5Tprivate.h \ - ../src/H5Gprivate.h -links.o: \ - links.c \ - h5test.h \ + ../src/H5Tpublic.h +ragged.o: \ + ragged.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -533,15 +538,31 @@ links.o: \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h \ - ../src/H5private.h \ - ../src/H5Tpkg.h \ - ../src/H5HGprivate.h \ - ../src/H5Fprivate.h \ - ../src/H5Rprivate.h \ - ../src/H5Tprivate.h \ - ../src/H5Gprivate.h -mount.o: \ - mount.c \ + ../src/H5private.h +space_overflow.o: \ + space_overflow.c \ + ../src/hdf5.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Ipublic.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Epublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h \ + ../src/H5RApublic.h +stab.o: \ + stab.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -572,8 +593,80 @@ mount.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -mtime.o: \ - mtime.c \ +tfile.o: \ + tfile.c \ + testhdf5.h \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Ipublic.h \ + ../src/H5Bprivate.h \ + ../src/H5Bpublic.h \ + ../src/H5Fprivate.h \ + ../src/H5Fpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Pprivate.h +tmeta.o: \ + tmeta.c \ + testhdf5.h \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Ipublic.h +trefer.o: \ + trefer.c \ + testhdf5.h \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Ipublic.h \ + ../src/hdf5.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h +tselect.o: \ + tselect.c \ + testhdf5.h \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5Eprivate.h \ + ../src/H5Epublic.h \ + ../src/H5Ipublic.h \ + ../src/hdf5.h \ + ../src/H5Apublic.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Zpublic.h \ + ../src/H5Rpublic.h +unlink.o: \ + unlink.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -604,8 +697,8 @@ mtime.o: \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h -ohdr.o: \ - ohdr.c \ +h5test.o: \ + h5test.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -635,15 +728,9 @@ ohdr.o: \ ../src/H5Fprivate.h \ ../src/H5Rprivate.h \ ../src/H5Tprivate.h \ - ../src/H5Gprivate.h \ - ../src/H5Bprivate.h \ - ../src/H5Iprivate.h \ - ../src/H5Oprivate.h \ - ../src/H5Sprivate.h \ - ../src/H5Zprivate.h \ - ../src/H5Gpkg.h -overhead.o: \ - overhead.c \ + ../src/H5Gprivate.h +chunk.o: \ + chunk.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -666,8 +753,9 @@ overhead.o: \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h -ragged.o: \ - ragged.c \ +dtypes.o: \ + dtypes.c \ + h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -690,9 +778,16 @@ ragged.o: \ ../src/H5RApublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h \ - ../src/H5private.h -space_overflow.o: \ - space_overflow.c \ + ../src/H5private.h \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5Fprivate.h \ + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h \ + ../src/H5Gprivate.h +extend.o: \ + extend.c \ + h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -712,9 +807,18 @@ space_overflow.o: \ ../src/H5Ppublic.h \ ../src/H5Zpublic.h \ ../src/H5Rpublic.h \ - ../src/H5RApublic.h -stab.o: \ - stab.c \ + ../src/H5RApublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h \ + ../src/H5private.h \ + ../src/H5Tpkg.h \ + ../src/H5HGprivate.h \ + ../src/H5Fprivate.h \ + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h \ + ../src/H5Gprivate.h +mtime.o: \ + mtime.c \ h5test.h \ ../src/hdf5.h \ ../src/H5public.h \ @@ -775,21 +879,6 @@ testhdf5.o: \ ../src/H5private.h \ ../src/H5public.h \ ../src/H5config.h -tfile.o: \ - tfile.c \ - testhdf5.h \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ - ../src/H5Ipublic.h \ - ../src/H5Bprivate.h \ - ../src/H5Bpublic.h \ - ../src/H5Fprivate.h \ - ../src/H5Fpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Pprivate.h th5s.o: \ th5s.c \ testhdf5.h \ @@ -817,92 +906,3 @@ th5s.o: \ ../src/H5Zprivate.h \ ../src/H5Zpublic.h \ ../src/H5Pprivate.h -tmeta.o: \ - tmeta.c \ - testhdf5.h \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ - ../src/H5Ipublic.h -trefer.o: \ - trefer.c \ - testhdf5.h \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ - ../src/H5Ipublic.h \ - ../src/hdf5.h \ - ../src/H5Apublic.h \ - ../src/H5ACpublic.h \ - ../src/H5Bpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Fpublic.h \ - ../src/H5Gpublic.h \ - ../src/H5HGpublic.h \ - ../src/H5HLpublic.h \ - ../src/H5MFpublic.h \ - ../src/H5MMpublic.h \ - ../src/H5Opublic.h \ - ../src/H5Ppublic.h \ - ../src/H5Zpublic.h \ - ../src/H5Rpublic.h -tselect.o: \ - tselect.c \ - testhdf5.h \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Eprivate.h \ - ../src/H5Epublic.h \ - ../src/H5Ipublic.h \ - ../src/hdf5.h \ - ../src/H5Apublic.h \ - ../src/H5ACpublic.h \ - ../src/H5Bpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Fpublic.h \ - ../src/H5Gpublic.h \ - ../src/H5HGpublic.h \ - ../src/H5HLpublic.h \ - ../src/H5MFpublic.h \ - ../src/H5MMpublic.h \ - ../src/H5Opublic.h \ - ../src/H5Ppublic.h \ - ../src/H5Zpublic.h \ - ../src/H5Rpublic.h -unlink.o: \ - unlink.c \ - h5test.h \ - ../src/hdf5.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5Ipublic.h \ - ../src/H5Apublic.h \ - ../src/H5ACpublic.h \ - ../src/H5Bpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Epublic.h \ - ../src/H5Fpublic.h \ - ../src/H5Gpublic.h \ - ../src/H5HGpublic.h \ - ../src/H5HLpublic.h \ - ../src/H5MFpublic.h \ - ../src/H5MMpublic.h \ - ../src/H5Opublic.h \ - ../src/H5Ppublic.h \ - ../src/H5Zpublic.h \ - ../src/H5Rpublic.h \ - ../src/H5RApublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h \ - ../src/H5private.h \ - ../src/H5Tpkg.h \ - ../src/H5HGprivate.h \ - ../src/H5Fprivate.h \ - ../src/H5Rprivate.h \ - ../src/H5Tprivate.h \ - ../src/H5Gprivate.h diff --git a/test/chunk.c b/test/chunk.c index e119b0c..5a00535 100644 --- a/test/chunk.c +++ b/test/chunk.c @@ -113,7 +113,7 @@ create_dataset (void) { hid_t file, space, dcpl, dset; hsize_t size[2]; - char *buf; + signed char *buf; /* The file */ file = H5Fcreate (FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_g); @@ -130,12 +130,12 @@ create_dataset (void) H5Pset_filter (dcpl, FILTER_COUNTER, 0, 0, NULL); /* The dataset */ - dset = H5Dcreate (file, "dset", H5T_NATIVE_CHAR, space, dcpl); + dset = H5Dcreate (file, "dset", H5T_NATIVE_SCHAR, space, dcpl); assert (dset>=0); /* The data */ buf = calloc (1, SQUARE (DS_SIZE*CH_SIZE)); - H5Dwrite (dset, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf); + H5Dwrite (dset, H5T_NATIVE_SCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf); free (buf); /* Close */ @@ -165,7 +165,7 @@ static double test_rowmaj (int op, hsize_t cache_size, hsize_t io_size) { hid_t file, dset, mem_space, file_space; - char *buf = calloc (1, SQUARE(io_size)); + signed char *buf = calloc (1, SQUARE(io_size)); hsize_t i, j, hs_size[2]; hssize_t hs_offset[2]; int mdc_nelmts, rdcc_nelmts; @@ -200,10 +200,10 @@ test_rowmaj (int op, hsize_t cache_size, hsize_t io_size) NULL, hs_size, NULL); if (READ==op) { - H5Dread (dset, H5T_NATIVE_CHAR, mem_space, file_space, + H5Dread (dset, H5T_NATIVE_SCHAR, mem_space, file_space, H5P_DEFAULT, buf); } else { - H5Dwrite (dset, H5T_NATIVE_CHAR, mem_space, file_space, + H5Dwrite (dset, H5T_NATIVE_SCHAR, mem_space, file_space, H5P_DEFAULT, buf); } H5Sclose (mem_space); @@ -243,7 +243,7 @@ test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset) hsize_t i, hs_size[2]; hsize_t nio = 0; hssize_t hs_offset[2]; - char *buf = calloc (1, SQUARE (io_size)); + signed char *buf = calloc (1, SQUARE (io_size)); int mdc_nelmts, rdcc_nelmts; double w0; @@ -268,10 +268,10 @@ test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset) H5Sselect_hyperslab (file_space, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL); if (READ==op) { - H5Dread (dset, H5T_NATIVE_CHAR, mem_space, file_space, + H5Dread (dset, H5T_NATIVE_SCHAR, mem_space, file_space, H5P_DEFAULT, buf); } else { - H5Dwrite (dset, H5T_NATIVE_CHAR, mem_space, file_space, + H5Dwrite (dset, H5T_NATIVE_SCHAR, mem_space, file_space, H5P_DEFAULT, buf); } H5Sclose (mem_space); diff --git a/test/dtypes.c b/test/dtypes.c index cd1cedb..5bc9060 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -189,15 +189,16 @@ generates_sigfpe(void) while (pid!=waitpid(pid, &status, 0)) /*void*/; if (WIFEXITED(status) && 0==WEXITSTATUS(status)) { - printf("Overflow cases will be tested.\n"); + puts("Floating-point overflow cases will be tested."); skip_overflow_tests_g = FALSE; } else if (WIFSIGNALED(status) && SIGFPE==WTERMSIG(status)) { - printf("Overflow cases cannot be safely tested.\n"); + puts("Floating-point overflow cases cannot be safely tested."); skip_overflow_tests_g = TRUE; } #else - printf("Cannot determine if overflows generate a SIGFPE; assuming yes.\n"); - printf("Overflow cases will not be tested.\n"); + puts("Cannot determine if floating-point overflows generate a SIGFPE;"); + puts("assuming yes."); + puts("Overflow cases will not be tested."); skip_overflow_tests_g = TRUE; #endif } @@ -301,7 +302,7 @@ test_copy(void) /* We should not be able to close a built-in byte */ H5E_BEGIN_TRY { - status = H5Tclose (H5T_NATIVE_CHAR); + status = H5Tclose (H5T_NATIVE_SCHAR); } H5E_END_TRY; if (status>=0) { FAILED(); @@ -1133,10 +1134,11 @@ test_conv_int (void) * Purpose: Test conversion of random integer values from SRC to DST. * These types should be any combination of: * - * H5T_NATIVE_CHAR H5T_NATIVE_UCHAR + * H5T_NATIVE_SCHAR H5T_NATIVE_UCHAR * H5T_NATIVE_SHORT H5T_NATIVE_USHORT * H5T_NATIVE_INT H5T_NATIVE_UINT * H5T_NATIVE_LONG H5T_NATIVE_ULONG + * H5T_NATIVE_LLONG H5T_NATIVE_ULLONG * * Return: Success: 0 * @@ -1184,7 +1186,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) /* What are the names of the source and destination types */ - if (H5Tequal(src, H5T_NATIVE_CHAR)) { + if (H5Tequal(src, H5T_NATIVE_SCHAR)) { src_type_name = "signed char"; src_type = INT_CHAR; } else if (H5Tequal(src, H5T_NATIVE_UCHAR)) { @@ -1219,7 +1221,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) src_type = INT_OTHER; } - if (H5Tequal(dst, H5T_NATIVE_CHAR)) { + if (H5Tequal(dst, H5T_NATIVE_SCHAR)) { dst_type_name = "signed char"; dst_type = INT_CHAR; } else if (H5Tequal(dst, H5T_NATIVE_UCHAR)) { @@ -2417,21 +2419,21 @@ run_integer_tests(const char *name) { int nerrors = 0; - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_UCHAR); - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_SHORT); - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_USHORT); - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_INT); - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_UINT); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_UCHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_SHORT); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_USHORT); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_INT); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_UINT); #if SIZEOF_LONG!=SIZEOF_INT - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_LONG); - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_ULONG); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_LONG); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_ULONG); #endif #if SIZEOF_LONG_LONG!=SIZEOF_LONG - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_LLONG); - nerrors += test_conv_int_1(name, H5T_NATIVE_CHAR, H5T_NATIVE_ULLONG); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_LLONG); + nerrors += test_conv_int_1(name, H5T_NATIVE_SCHAR, H5T_NATIVE_ULLONG); #endif - nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_INT); @@ -2445,7 +2447,7 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_UCHAR, H5T_NATIVE_ULLONG); #endif - nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_USHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_INT); @@ -2459,7 +2461,7 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_SHORT, H5T_NATIVE_ULLONG); #endif - nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_INT); @@ -2473,7 +2475,7 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_USHORT, H5T_NATIVE_ULLONG); #endif - nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_USHORT); @@ -2487,7 +2489,7 @@ run_integer_tests(const char *name) nerrors += test_conv_int_1(name, H5T_NATIVE_INT, H5T_NATIVE_ULLONG); #endif - nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_UINT, H5T_NATIVE_USHORT); @@ -2502,7 +2504,7 @@ run_integer_tests(const char *name) #endif #if SIZEOF_LONG!=SIZEOF_INT - nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_LONG, H5T_NATIVE_USHORT); @@ -2516,7 +2518,7 @@ run_integer_tests(const char *name) #endif #if SIZEOF_LONG!=SIZEOF_INT - nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_ULONG, H5T_NATIVE_USHORT); @@ -2530,7 +2532,7 @@ run_integer_tests(const char *name) #endif #if SIZEOF_LONG_LONG!=SIZEOF_LONG - nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_LLONG, H5T_NATIVE_USHORT); @@ -2544,7 +2546,7 @@ run_integer_tests(const char *name) #endif #if SIZEOF_LONG_LONG!=SIZEOF_LONG - nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_CHAR); + nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_SCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_UCHAR); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_SHORT); nerrors += test_conv_int_1(name, H5T_NATIVE_ULLONG, H5T_NATIVE_USHORT); diff --git a/test/extend.c b/test/extend.c index a996d3f..cae6e0c 100644 --- a/test/extend.c +++ b/test/extend.c @@ -50,9 +50,9 @@ main (void) hssize_t offset[2]; char filename[1024]; - TESTING("dataset extend"); h5_reset(); fapl = h5_fileaccess(); + TESTING("dataset extend"); /* Initialize buffer and space */ for (i=0; i<NX; i++) { diff --git a/test/h5test.c b/test/h5test.c index f124e0e..3a08eab 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -317,17 +317,17 @@ h5_fileaccess(void) void h5_no_hwconv(void) { - H5Tunregister(H5T_conv_char_uchar); - H5Tunregister(H5T_conv_char_short); - H5Tunregister(H5T_conv_char_ushort); - H5Tunregister(H5T_conv_char_int); - H5Tunregister(H5T_conv_char_uint); - H5Tunregister(H5T_conv_char_long); - H5Tunregister(H5T_conv_char_ulong); - H5Tunregister(H5T_conv_char_llong); - H5Tunregister(H5T_conv_char_ullong); + H5Tunregister(H5T_conv_schar_uchar); + H5Tunregister(H5T_conv_schar_short); + H5Tunregister(H5T_conv_schar_ushort); + H5Tunregister(H5T_conv_schar_int); + H5Tunregister(H5T_conv_schar_uint); + H5Tunregister(H5T_conv_schar_long); + H5Tunregister(H5T_conv_schar_ulong); + H5Tunregister(H5T_conv_schar_llong); + H5Tunregister(H5T_conv_schar_ullong); - H5Tunregister(H5T_conv_uchar_char); + H5Tunregister(H5T_conv_uchar_schar); H5Tunregister(H5T_conv_uchar_short); H5Tunregister(H5T_conv_uchar_ushort); H5Tunregister(H5T_conv_uchar_int); @@ -337,7 +337,7 @@ h5_no_hwconv(void) H5Tunregister(H5T_conv_uchar_llong); H5Tunregister(H5T_conv_uchar_ullong); - H5Tunregister(H5T_conv_short_char); + H5Tunregister(H5T_conv_short_schar); H5Tunregister(H5T_conv_short_uchar); H5Tunregister(H5T_conv_short_ushort); H5Tunregister(H5T_conv_short_int); @@ -347,7 +347,7 @@ h5_no_hwconv(void) H5Tunregister(H5T_conv_short_llong); H5Tunregister(H5T_conv_short_ullong); - H5Tunregister(H5T_conv_ushort_char); + H5Tunregister(H5T_conv_ushort_schar); H5Tunregister(H5T_conv_ushort_uchar); H5Tunregister(H5T_conv_ushort_short); H5Tunregister(H5T_conv_ushort_int); @@ -357,7 +357,7 @@ h5_no_hwconv(void) H5Tunregister(H5T_conv_ushort_llong); H5Tunregister(H5T_conv_ushort_ullong); - H5Tunregister(H5T_conv_int_char); + H5Tunregister(H5T_conv_int_schar); H5Tunregister(H5T_conv_int_uchar); H5Tunregister(H5T_conv_int_short); H5Tunregister(H5T_conv_int_ushort); @@ -367,7 +367,7 @@ h5_no_hwconv(void) H5Tunregister(H5T_conv_int_llong); H5Tunregister(H5T_conv_int_ullong); - H5Tunregister(H5T_conv_uint_char); + H5Tunregister(H5T_conv_uint_schar); H5Tunregister(H5T_conv_uint_uchar); H5Tunregister(H5T_conv_uint_short); H5Tunregister(H5T_conv_uint_ushort); @@ -377,7 +377,7 @@ h5_no_hwconv(void) H5Tunregister(H5T_conv_uint_llong); H5Tunregister(H5T_conv_uint_ullong); - H5Tunregister(H5T_conv_long_char); + H5Tunregister(H5T_conv_long_schar); H5Tunregister(H5T_conv_long_uchar); H5Tunregister(H5T_conv_long_short); H5Tunregister(H5T_conv_long_ushort); @@ -387,7 +387,7 @@ h5_no_hwconv(void) H5Tunregister(H5T_conv_long_llong); H5Tunregister(H5T_conv_long_ullong); - H5Tunregister(H5T_conv_ulong_char); + H5Tunregister(H5T_conv_ulong_schar); H5Tunregister(H5T_conv_ulong_uchar); H5Tunregister(H5T_conv_ulong_short); H5Tunregister(H5T_conv_ulong_ushort); @@ -397,7 +397,7 @@ h5_no_hwconv(void) H5Tunregister(H5T_conv_ulong_llong); H5Tunregister(H5T_conv_ulong_ullong); - H5Tunregister(H5T_conv_llong_char); + H5Tunregister(H5T_conv_llong_schar); H5Tunregister(H5T_conv_llong_uchar); H5Tunregister(H5T_conv_llong_short); H5Tunregister(H5T_conv_llong_ushort); @@ -407,7 +407,7 @@ h5_no_hwconv(void) H5Tunregister(H5T_conv_llong_ulong); H5Tunregister(H5T_conv_llong_ullong); - H5Tunregister(H5T_conv_ullong_char); + H5Tunregister(H5T_conv_ullong_schar); H5Tunregister(H5T_conv_ullong_uchar); H5Tunregister(H5T_conv_ullong_short); H5Tunregister(H5T_conv_ullong_ushort); diff --git a/test/mtime.c b/test/mtime.c index 54188ca..e615a85 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -42,7 +42,8 @@ main(void) time_t now; struct tm *tm; H5G_stat_t sb1, sb2; - char buf1[32], buf2[32], filename[1024]; + signed char buf1[32], buf2[32]; + char filename[1024]; h5_reset(); fapl = h5_fileaccess(); @@ -54,7 +55,7 @@ main(void) if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) return 1; if ((space=H5Screate_simple(1, size, NULL))<0) return 1; - if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_CHAR, space, H5P_DEFAULT))<0) + if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_SCHAR, space, H5P_DEFAULT))<0) return 1; now = time(NULL); if (H5Dclose(dset)<0) return 1; diff --git a/test/tattr.c b/test/tattr.c index 132af1c..24746fb 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -323,7 +323,8 @@ test_attr_compound_write(void) ret = H5Tinsert(tid1, ATTR4_FIELDNAME2, attr4_field2_off, H5T_NATIVE_DOUBLE); CHECK(ret, FAIL, "H5Tinsert"); attr4_field3_off=HOFFSET(struct attr4_struct, c); - ret = H5Tinsert(tid1, ATTR4_FIELDNAME3, attr4_field3_off, H5T_NATIVE_CHAR); + ret = H5Tinsert(tid1, ATTR4_FIELDNAME3, attr4_field3_off, + H5T_NATIVE_SCHAR); CHECK(ret, FAIL, "H5Tinsert"); /* Create dataspace for 1st attribute */ @@ -474,9 +475,9 @@ test_attr_compound_read(void) class=H5Tget_class(field); VERIFY(class, H5T_INTEGER, "H5Tget_class"); order=H5Tget_order(field); - VERIFY(order, H5Tget_order(H5T_NATIVE_CHAR), "H5Tget_order"); + VERIFY(order, H5Tget_order(H5T_NATIVE_SCHAR), "H5Tget_order"); size=H5Tget_size(field); - VERIFY(size, H5Tget_size(H5T_NATIVE_CHAR), "H5Tget_size"); + VERIFY(size, H5Tget_size(H5T_NATIVE_SCHAR), "H5Tget_size"); H5Tclose(field); /* Read attribute information */ diff --git a/test/th5s.c b/test/th5s.c index b53e9aa..30b1f2e 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -324,7 +324,7 @@ test_h5s_compound_scalar_write(void) CHECK(tid1, FAIL, "H5Tcreate"); space4_field1_off=HOFFSET(struct space4_struct, c1); ret = H5Tinsert(tid1, SPACE4_FIELDNAME1, space4_field1_off, - H5T_NATIVE_CHAR); + H5T_NATIVE_SCHAR); CHECK(ret, FAIL, "H5Tinsert"); space4_field2_off=HOFFSET(struct space4_struct, u); ret = H5Tinsert(tid1, SPACE4_FIELDNAME2, space4_field2_off, @@ -336,7 +336,7 @@ test_h5s_compound_scalar_write(void) CHECK(ret, FAIL, "H5Tinsert"); space4_field4_off=HOFFSET(struct space4_struct, c2); ret = H5Tinsert(tid1, SPACE4_FIELDNAME4, space4_field4_off, - H5T_NATIVE_CHAR); + H5T_NATIVE_SCHAR); CHECK(ret, FAIL, "H5Tinsert"); /* Create scalar dataspace */ |