mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mirror vfd test fixes (#1629)

Browse Source 
* Use the FAPL that was created earlier in the test (and delete an unused
variable).   This allows 'make check-vfd' to pass with --enable-mirror-vfd.

* Check for testing directory before creating, to avoid warning from bash.
Clean out .libs directory before re-using it (after a failed test), to
remove any files generated by libtool.

* Committing clang-format changes

* Increment error count on failed file open and skip tests for VFDs that need
modified filenames.

* Skip the mirror VFD for 'make check-vfd' - the mirror VFD requires networking
configuration parameters and can't be provided for an automated test that
is configured with an environment variable.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Quincey Koziol 2022-04-18 15:28:20 -05:00 committed by GitHub
parent 17be6c2574
commit f875a73711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/conclude.am
View File

@ -283,7 +283,9 @@ if BUILD_PARALLEL_CONDITIONAL
# VFD_LIST += mpio
endif
if MIRROR_VFD_CONDITIONAL
VFD_LIST += mirror
# Mirror VFD needs network configuration, etc. and isn't easy to set
# reasonable defaults for that info.
# VFD_LIST += mirror
endif
if ROS3_VFD_CONDITIONAL
VFD_LIST += ros3

12
test/cross_read.c
View File

@ -229,8 +229,10 @@ check_file(char *filename)
#endif
/* Open the file. */
if ((fid = H5Fopen(pathname, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
if ((fid = H5Fopen(pathname, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
nerrors++;
FAIL_STACK_ERROR;
}
TESTING("regular dataset of LE DOUBLE");
nerrors += check_data_f(DATASETNAME, fid);
@ -357,6 +359,14 @@ main(void)
h5_reset();
/*
* Skip tests for VFDs that need modified filenames.
*/
if (h5_driver_uses_modified_filename()) {
HDputs(" -- SKIPPED for incompatible VFD --");
HDexit(EXIT_SUCCESS);
}
HDputs("\n");
HDputs("Testing reading data created on Linux");
h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof(filename));

18
test/mirror_vfd.c
View File

@ -2251,12 +2251,11 @@ static int
test_vanishing_datasets(void)
{
struct mirrortest_filenames names;
hid_t file_id = H5I_INVALID_HID;
hid_t fapl_id = H5I_INVALID_HID;
hid_t dset_id = H5I_INVALID_HID;
hid_t dspace_id = H5I_INVALID_HID;
hid_t mirror_fapl_id = H5I_INVALID_HID;
hsize_t dims[2] = {DATABUFFER_SIZE, DATABUFFER_SIZE};
hid_t file_id = H5I_INVALID_HID;
hid_t fapl_id = H5I_INVALID_HID;
hid_t dset_id = H5I_INVALID_HID;
hid_t dspace_id = H5I_INVALID_HID;
hsize_t dims[2] = {DATABUFFER_SIZE, DATABUFFER_SIZE};
uint32_t buf[DATABUFFER_SIZE][DATABUFFER_SIZE]; /* consider malloc? */
H5G_info_t group_info;
unsigned int i, j, k;
@ -2334,7 +2333,7 @@ test_vanishing_datasets(void)
file_id = H5I_INVALID_HID;
/* verify there are no datasets in file */
file_id = H5Fopen(names.rw, H5F_ACC_RDONLY, H5P_DEFAULT);
file_id = H5Fopen(names.rw, H5F_ACC_RDONLY, fapl_id);
if (file_id < 0) {
TEST_ERROR;
}
@ -2349,7 +2348,7 @@ test_vanishing_datasets(void)
if (H5Fclose(file_id) < 0) {
TEST_ERROR;
}
file_id = H5Fopen(names.wo, H5F_ACC_RDONLY, H5P_DEFAULT);
file_id = H5Fopen(names.wo, H5F_ACC_RDONLY, fapl_id);
if (file_id < 0) {
TEST_ERROR;
}
@ -2385,9 +2384,6 @@ test_vanishing_datasets(void)
error:
H5E_BEGIN_TRY
{
if (mirror_fapl_id != H5I_INVALID_HID) {
H5Pclose(mirror_fapl_id);
}
if (fapl_id != H5I_INVALID_HID) {
H5Pclose(fapl_id);
}

8
test/test_mirror.sh.in
View File

@ -45,7 +45,9 @@ done
RUN_DIR=mirror_vfd_test
MIRROR_UTILS=../utils/mirror_vfd # TODO: presupposes from test/
mkdir $RUN_DIR
if [[ ! -d $RUN_DIR ]] ; then
mkdir $RUN_DIR
fi
# Copy program files into dedicated test directory
for FILE in $MIRROR_UTILS/mirror_* ; do
@ -61,6 +63,10 @@ cp mirror_vfd $RUN_DIR
# wrapper script. Copy these libs builds if appropriate.
if [ -f $MIRROR_UTILS/.libs/mirror_server ] ; then
RUN_LIBS=$RUN_DIR/.libs
# Delete previous .libs directory, to remove any generated libtool files
if [[ -d $RUN_LIBS ]] ; then
rm -rf $RUN_LIBS
fi
mkdir $RUN_LIBS
for FILE in $MIRROR_UTILS/.libs/mirror_* ; do
case "$FILE" in