diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-09-25 21:11:52 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-09-25 21:11:52 (GMT) |
| commit | aa08db839e6aea89487be985704d57a0e424b21b (patch) | |
| tree | 51dbbee3efa3bc1a3f1bb2314202a5934d6f021c /testpar | |
| parent | cdc4b8a0fb55af4cf1a7bb4da5d8c4d454a0b8b6 (diff) | |
| parent | 571a5e9250ca69adb54ef956361a5cf77059f67c (diff) | |
| download | hdf5-aa08db839e6aea89487be985704d57a0e424b21b.zip hdf5-aa08db839e6aea89487be985704d57a0e424b21b.tar.gz hdf5-aa08db839e6aea89487be985704d57a0e424b21b.tar.bz2 | |
Merge pull request #2882 in HDFFV/hdf5 from ~BYRN/hdf5_adb:feature/cmakeV2-clang-format to develop
* commit '571a5e9250ca69adb54ef956361a5cf77059f67c':
Add h5ls test plugin format target
Fix manifest
Add code owners file
Update actions - split push/pull-request commits
Change to executable
Change to based on LLVM format
Fix comment formatting due to tabs conversion
Disable formatting for file
File changes to affect formatting
CMake and script changes for clang-format
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | testpar/testphdf5.h | 5 |
2 files changed, 19 insertions, 4 deletions
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index a9f45d5..46bfb37 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -39,7 +39,14 @@ else () endif () set_target_properties (testphdf5 PROPERTIES FOLDER test/par) -MACRO (ADD_H5P_EXE file) +#----------------------------------------------------------------------------- +# Add Target to clang-format +#----------------------------------------------------------------------------- +if (HDF5_ENABLE_FORMATTERS) + clang_format (HDF5_TEST_PAR_testphdf5_FORMAT testphdf5) +endif () + +macro (ADD_H5P_EXE file) add_executable (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c) target_compile_options(${file} PRIVATE "${HDF5_CMAKE_C_FLAGS}") target_include_directories (${file} @@ -59,7 +66,14 @@ MACRO (ADD_H5P_EXE file) ) endif () set_target_properties (${file} PROPERTIES FOLDER test/par) -ENDMACRO (ADD_H5P_EXE file) + + #----------------------------------------------------------------------------- + # Add Target to clang-format + #----------------------------------------------------------------------------- + if (HDF5_ENABLE_FORMATTERS) + clang_format (HDF5_TEST_PAR_${file}_FORMAT ${file}) + endif () +endmacro (ADD_H5P_EXE file) set (H5P_TESTS t_mpi diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index cf611b7..b086366 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -93,8 +93,9 @@ enum H5TEST_COLL_CHUNK_API {API_NONE=0,API_LINK_HARD, #define MSPACE1_RANK 1 /* Rank of the first dataset in memory */ #define MSPACE1_DIM 27000 /* Dataset size in memory */ #define FSPACE_RANK 2 /* Dataset rank as it is stored in the file */ -#define FSPACE_DIM1 9 /* Dimension sizes of the dataset as it is stored in the file */ -#define FSPACE_DIM2 3600 /* We will read dataset back from the file to the dataset in memory with these dataspace parameters. */ +#define FSPACE_DIM1 9 /* Dimension sizes of the dataset as it is stored in the file */ +#define FSPACE_DIM2 3600 +/* We will read dataset back from the file to the dataset in memory with these dataspace parameters. */ #define MSPACE_RANK 2 #define MSPACE_DIM1 9 #define MSPACE_DIM2 3600 |