diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-10-01 15:39:03 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-10-01 15:39:03 (GMT) |
| commit | 753adc730358861c489c1da7e4ccd018af6b351c (patch) | |
| tree | a3545e5f0dfa63f636f171f30f116eb532272cb1 /testpar | |
| parent | 06e367c49b1d0e0875a3aae69817fbceb4020aa9 (diff) | |
| download | hdf5-753adc730358861c489c1da7e4ccd018af6b351c.zip hdf5-753adc730358861c489c1da7e4ccd018af6b351c.tar.gz hdf5-753adc730358861c489c1da7e4ccd018af6b351c.tar.bz2 | |
Merge clang-format changes from develop
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 3e23c0c..3ce0988 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -37,7 +37,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} @@ -57,7 +64,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 5cbd1fa..87bbbd9 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 |