diff options
| -rw-r--r-- | MANIFEST | 9 | ||||
| -rw-r--r-- | fortran/test/tH5P.f90 | 6 | ||||
| -rw-r--r-- | test/family_v16_00000.h5 (renamed from test/family_v1.6_00000.h5) | bin | 5120 -> 5120 bytes | |||
| -rw-r--r-- | test/family_v16_00001.h5 (renamed from test/family_v1.6_00001.h5) | bin | 5120 -> 5120 bytes | |||
| -rw-r--r-- | test/family_v16_00002.h5 (renamed from test/family_v1.6_00002.h5) | bin | 5120 -> 5120 bytes | |||
| -rw-r--r-- | test/family_v16_00003.h5 (renamed from test/family_v1.6_00003.h5) | bin | 4048 -> 4048 bytes | |||
| -rw-r--r-- | test/flush2.c | 6 | ||||
| -rw-r--r-- | test/vfd.c | 4 | ||||
| -rw-r--r-- | vms/build.com | 34 |
9 files changed, 51 insertions, 8 deletions
@@ -749,10 +749,10 @@ ./test/external.c ./test/error_test.c ./test/err_compat.c -./test/family_v1.6_00000.h5 -./test/family_v1.6_00001.h5 -./test/family_v1.6_00002.h5 -./test/family_v1.6_00003.h5 +./test/family_v16_00000.h5 +./test/family_v16_00001.h5 +./test/family_v16_00002.h5 +./test/family_v16_00003.h5 ./test/fheap.c ./test/fill_old.h5 ./test/fillval.c @@ -1623,6 +1623,7 @@ ./vms/test/check.com ./vms/test/make.com +./vms/build.com ./vms/install.com ./vms/make.com ./vms/tools/h5copy/make.com diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90 index 7f655de..76edd61 100644 --- a/fortran/test/tH5P.f90 +++ b/fortran/test/tH5P.f90 @@ -244,6 +244,12 @@ CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error, access_prp = fapl) CALL check("h5fcreate_f", error, total_error) + if(error .ne. 0) then + write(*,*) "Cannot create file using multi-file driver... Exiting...." + total_error = 1 + call h5pclose_f(fapl, error) + return + endif ! diff --git a/test/family_v1.6_00000.h5 b/test/family_v16_00000.h5 Binary files differindex 5b69c93..5b69c93 100644 --- a/test/family_v1.6_00000.h5 +++ b/test/family_v16_00000.h5 diff --git a/test/family_v1.6_00001.h5 b/test/family_v16_00001.h5 Binary files differindex bf55b32..bf55b32 100644 --- a/test/family_v1.6_00001.h5 +++ b/test/family_v16_00001.h5 diff --git a/test/family_v1.6_00002.h5 b/test/family_v16_00002.h5 Binary files differindex 9bd0891..9bd0891 100644 --- a/test/family_v1.6_00002.h5 +++ b/test/family_v16_00002.h5 diff --git a/test/family_v1.6_00003.h5 b/test/family_v16_00003.h5 Binary files differindex fedce2a..fedce2a 100644 --- a/test/family_v1.6_00003.h5 +++ b/test/family_v16_00003.h5 diff --git a/test/flush2.c b/test/flush2.c index dbb0a82..5ec5300 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -196,7 +196,8 @@ main(void) #if defined _WIN32 && defined _HDF5USEDLL_ SKIPPED(); puts(" DLL will flush the file even when calling _exit, skip this test temporarily"); - +#elif defined H5_VMS + SKIPPED(); #else H5_FAILED() goto error; @@ -218,7 +219,8 @@ main(void) #if defined _WIN32 && defined _HDF5USEDLL_ SKIPPED(); puts(" DLL will flush the file even when calling _exit, skip this test temporarily"); - +#elif defined H5_VMS + SKIPPED(); #else H5_FAILED() goto error; @@ -49,7 +49,7 @@ const char *FILENAME[] = { NULL }; -#define COMPAT_BASENAME "family_v1.6_" +#define COMPAT_BASENAME "family_v16_" /*------------------------------------------------------------------------- @@ -787,7 +787,7 @@ error: * The source file was created by the test/file_handle.c * of the v1.6 library. Then tools/misc/h5repart.c was * used to concantenated. The command was "h5repart -m 5k - * family_file%05d.h5 family_v1.6_%05d.h5". + * family_file%05d.h5 family_v16_%05d.h5". * * Return: Success: 0 * Failure: -1 diff --git a/vms/build.com b/vms/build.com new file mode 100644 index 0000000..ca83f24 --- /dev/null +++ b/vms/build.com @@ -0,0 +1,34 @@ +$!# +$!# 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. +$!# +$! +$! +$! This file builds C, Frtran, C++ HDF5 librraies and runs the tests +$! Specify location of the top HDF5 source directory +$ +$ hdf5top == "sys$sysusers:[pourmale.hdf5]" +$ len = F$LENGTH(hdf5top) +$ tmp = F$EXTRACT(0, len-1, hdf5top) +$ hdf5vms = tmp + ".VMS]" +$ hdf5ctest = tmp + ".TEST]" +$ hdf5f90test = tmp + ".FORTRAN.TEST]" +$ hdf5cxxtest = tmp + ".C__.TEST]" +$ set def 'hdf5vms' +$@make +$ set def 'hdf5ctest' +@check +$ set def 'hdf5f90test' +@check +$ set def 'hdf5cxxtest' +@check |