From ab2c31bc87fb10e7dd6d6d5846743664694287ed Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Wed, 3 Feb 2021 07:57:04 -0600 Subject: Update supported platforms (#303) * OESS-98 convert plugin option to FetchContent, add tests * Fixes for pkcfg files because of plugin option * OESS-98 fix tools test for plugins * Keep doxygen comments under 100 chars long - format hint * Whitespace * HDFFV-11144 - Reclassify CMake messages * HDFFV-11099/11100 added help text * Reworked switch statement to compare string instead * Fix typo * Update CDash mode * Correct name of threadsafe * Correct option name * Undo accidental commit * Note LLVM 10 to 11 format default changes * Update format plugin * Undo clang-format version 11 changes * One more correction * Update supported platforms * Revert whitespace changes * Correct whitespace --- release_docs/RELEASE.txt | 18 ++++++++++++------ src/H5Dvirtual.c | 12 ++++++------ src/H5TS.c | 3 +-- test/vds.c | 33 ++++++++++++++++++--------------- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index d248fdc..91eaaec 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1063,17 +1063,23 @@ The following platforms are not supported but have been tested for this release. #1 SMP ppc64 GNU/Linux IBM XL C/C++ for Linux, V13.1 (ostrich) and IBM XL Fortran for Linux, V15.1 - Fedora32 5.8.18-200.fc32.x86_64 - #1 SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6) - GNU Fortran (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6) - clang version 10.0.1 (Fedora 10.0.1-3.fc32) + Fedora33 5.10.10-200.fc33.x86_64 + #1 SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.1 20201125 (Red Hat 10.2.1-9) + GNU Fortran (GCC) 10.2.1 20201125 (Red Hat 10.2.1-9) + clang version 11.0.0 (Fedora 11.0.0-2.fc33) (cmake and autotools) - Ubuntu20.10 -5.8.0-29-generic-x86_64 - #31-Ubuntu SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.0-13ubuntu1 + Ubuntu20.10 5.8.0-41-generic-x86_64 + #46-Ubuntu SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.0-13ubuntu1 GNU Fortran (GCC) 10.2.0-13ubuntu1 (cmake and autotools) + SUSE15sp2 5.3.18-22-default + #1 SMP x86_64 GNU/Linux GNU gcc (SUSE Linux) 7.5.0 + GNU Fortran (SUSE Linux) 7.5.0 + clang version 7.0.1 (tags/RELEASE_701/final 349238) + (cmake and autotools) + Known Problems ============== diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c index fb27b89..89fa5eb 100644 --- a/src/H5Dvirtual.c +++ b/src/H5Dvirtual.c @@ -395,8 +395,8 @@ done: * Purpose: Store virtual dataset layout information, for new dataset * * Note: We assume here that the contents of the heap block cannot - * change! If this ever stops being the case we must change - * this code to allow overwrites of the heap block. -NAF + * change! If this ever stops being the case we must change + * this code to allow overwrites of the heap block. -NAF * * Return: Success: SUCCEED * Failure: FAIL @@ -2238,7 +2238,7 @@ H5D__virtual_init(H5F_t *f, const H5D_t *dset, hid_t dapl_id) /* Retrieve VDS file FAPL to layout */ if (storage->source_fapl <= 0) { - H5P_genplist_t *source_fapl = NULL; /* Source file FAPL */ + H5P_genplist_t * source_fapl = NULL; /* Source file FAPL */ H5F_close_degree_t close_degree = H5F_CLOSE_WEAK; /* Close degree for source files */ if ((storage->source_fapl = H5F_get_access_plist(f, FALSE)) < 0) @@ -2254,8 +2254,8 @@ H5D__virtual_init(H5F_t *f, const H5D_t *dset, hid_t dapl_id) } /* end if */ #ifndef NDEBUG else { - H5P_genplist_t *source_fapl = NULL; /* Source file FAPL */ - H5F_close_degree_t close_degree; /* Close degree for source files */ + H5P_genplist_t * source_fapl = NULL; /* Source file FAPL */ + H5F_close_degree_t close_degree; /* Close degree for source files */ /* Get property list pointer */ if (NULL == (source_fapl = (H5P_genplist_t *)H5I_object(storage->source_fapl))) @@ -2266,7 +2266,7 @@ H5D__virtual_init(H5F_t *f, const H5D_t *dset, hid_t dapl_id) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file close degree") HDassert(close_degree == H5F_CLOSE_WEAK); - } /* end else */ + } /* end else */ #endif /* NDEBUG */ /* Copy DAPL to layout */ diff --git a/src/H5TS.c b/src/H5TS.c index 572ba65..6c4bb63 100644 --- a/src/H5TS.c +++ b/src/H5TS.c @@ -405,8 +405,7 @@ H5TS__mutex_acquire(H5TS_mutex_t *mutex, unsigned int lock_count, hbool_t *acqui *-------------------------------------------------------------------------- */ herr_t -H5TSmutex_acquire(unsigned int lock_count, hbool_t *acquired) -{ +H5TSmutex_acquire(unsigned int lock_count, hbool_t *acquired){ FUNC_ENTER_API_NAMECHECK_ONLY /*NO TRACE*/ diff --git a/test/vds.c b/test/vds.c index d8cb4cf..f115f2b 100644 --- a/test/vds.c +++ b/test/vds.c @@ -40,8 +40,8 @@ const char *FILENAME[] = {"vds_virt_0", "vds_virt_1", "vds_src_0", "vds_src_1", /* For verbose output just use standard error printing */ #define TESTING_2_SUPPRESSED(WHAT) TESTING_2(WHAT) -#define PASSED_SUPPRESSED() PASSED() -#define TEST_ERROR_SUPPRESSED TEST_ERROR +#define PASSED_SUPPRESSED() PASSED() +#define TEST_ERROR_SUPPRESSED TEST_ERROR /* Print config directly to output */ #define PRINT_CONFIG(...) \ @@ -54,7 +54,7 @@ const char *FILENAME[] = {"vds_virt_0", "vds_virt_1", "vds_src_0", "vds_src_1", /* Global strings for error output */ char vds_config_str_g[128] = ""; -char vds_test_str_g[128] = ""; +char vds_test_str_g[128] = ""; /* Replacement for TESTING_2 for non-verbose-output */ #define TESTING_2_SUPPRESSED(WHAT) \ @@ -68,7 +68,7 @@ char vds_test_str_g[128] = ""; /* Replacement for TEST_ERROR for non-verbose output */ #define TEST_ERROR_SUPPRESSED \ { \ - printf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g); \ + printf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g); \ TEST_ERROR \ } @@ -12321,8 +12321,9 @@ main(void) /* Display testing info */ low_string = h5_get_version_string(low); high_string = h5_get_version_string(high); - HDsnprintf(msg, sizeof(msg), "Testing virtual dataset I/O with file version bounds: (%s, %s):", low_string, - high_string); + HDsnprintf(msg, sizeof(msg), + "Testing virtual dataset I/O with file version bounds: (%s, %s):", low_string, + high_string); HDputs(msg); for (test_api_config = (int)TEST_API_BASIC; test_api_config < (int)TEST_API_NTESTS; @@ -12332,22 +12333,24 @@ main(void) TESTING_2("Virtual dataset I/O") #ifdef VDS_TEST_VERBOSE HDputs(""); -#else /* VDS_TEST_VERBOSE */ +#else /* VDS_TEST_VERBOSE */ tmp_nerrors = nerrors; #endif /* VDS_TEST_VERBOSE */ for (bit_config = 0; bit_config < TEST_IO_NTESTS; bit_config++) { /* Skip invalid configurations */ - if ((bit_config & TEST_IO_FCLOSE_SEMI) - && (bit_config & TEST_IO_FCLOSE_STRONG)) + if ((bit_config & TEST_IO_FCLOSE_SEMI) && (bit_config & TEST_IO_FCLOSE_STRONG)) continue; /* Print message */ - PRINT_CONFIG("%s%s%s, %s file close degree", bit_config & TEST_IO_CLOSE_SRC ? "closed source dataset, " : "", - bit_config & TEST_IO_DIFFERENT_FILE ? "different source file" : "same source file", - bit_config & TEST_IO_REOPEN_VIRT ? ", reopen virtual file" : "", - bit_config & TEST_IO_FCLOSE_SEMI ? "H5F_CLOSE_SEMI" : - (bit_config & TEST_IO_FCLOSE_STRONG ? "H5F_CLOSE_STRONG" : "H5F_CLOSE_WEAK")); + PRINT_CONFIG( + "%s%s%s, %s file close degree", + bit_config & TEST_IO_CLOSE_SRC ? "closed source dataset, " : "", + bit_config & TEST_IO_DIFFERENT_FILE ? "different source file" : "same source file", + bit_config & TEST_IO_REOPEN_VIRT ? ", reopen virtual file" : "", + bit_config & TEST_IO_FCLOSE_SEMI + ? "H5F_CLOSE_SEMI" + : (bit_config & TEST_IO_FCLOSE_STRONG ? "H5F_CLOSE_STRONG" : "H5F_CLOSE_WEAK")); /* Set file close degree */ if (bit_config & TEST_IO_FCLOSE_SEMI) { @@ -12372,7 +12375,7 @@ main(void) } #ifndef VDS_TEST_VERBOSE - if(tmp_nerrors == nerrors) + if (tmp_nerrors == nerrors) PASSED(); #endif /* VDS_TEST_VERBOSE */ -- cgit v0.12