develop revert source to clang-format version 11 (#293)

* 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

7 files changed, 62 insertions, 62 deletions

diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 536d312..3ec70fd 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -4220,7 +4220,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
     herr_t      ret;
 #ifdef LATER /* fletcher32 */
     H5Z_filter_t filter_info;
-#endif /* LATER */
+#endif       /* LATER */
     char message[256];
 
     /* Set up MPI parameters */
@@ -4248,7 +4248,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
 
             ret = H5Pset_fletcher32(dcpl);
             VRFY((ret >= 0),"set filter (flecher32) succeeded");
-#endif /* LATER */
+#endif       /* LATER */
     }
     else  {
         VRFY(0, "Unexpected mode, only test for TEST_FILTERS_READ.");
@@ -4290,7 +4290,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
     test_name = "Broken Collective I/O - Filter is required";
     no_collective_cause_local_expected = H5D_MPIO_FILTERS;
     no_collective_cause_global_expected = H5D_MPIO_FILTERS;
-#endif /* LATER */
+#endif       /* LATER */
 
     /* Get the file dataspace */
     file_space = H5Dget_space(dataset);
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 219ffaf..414b081 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -2465,7 +2465,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
                         HDfprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, FUNC);
                     }
 
-#if 0 /* This has been useful debugging code -- keep it for now. */
+#if 0  /* This has been useful debugging code -- keep it for now. */
                 if ( mssg.req != READ_REQ_REPLY_CODE ) {
 
                 HDfprintf(stdout,
@@ -6880,7 +6880,7 @@ main(int argc, char **argv)
     H5open();
 
     express_test = do_express_test();
-#if 0 /* JRM */
+#if 0  /* JRM */
     express_test = 0;
 #endif /* JRM */
     if (express_test) {
diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c
index b58858b..8b9eb36 100644
--- a/testpar/t_chunk_alloc.c
+++ b/testpar/t_chunk_alloc.c
@@ -24,7 +24,7 @@ static int mpi_size, mpi_rank;
 
 #define DSET_NAME    "ExtendibleArray"
 #define CHUNK_SIZE   1000 /* #elements per chunk */
-#define CHUNK_FACTOR 200 /* default dataset size in terms of chunks */
+#define CHUNK_FACTOR 200  /* default dataset size in terms of chunks */
 #define CLOSE        1
 #define NO_CLOSE     0
 
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index a50cb24..10d6c27 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -346,7 +346,7 @@ test_filter_read(void)
             VRFY(hrc >= 0, "H5Pclose");
         }
 #endif /* H5_HAVE_FILTER_SZIP */
-    } /* end for */
+    }  /* end for */
 
     /*----------------------------------------------------------
      * STEP 4: Test shuffling by itself.
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index fe2a549..fe73ba0 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -162,9 +162,9 @@ test_mpio_overlap_writes(char *filename)
     return (nerrs);
 }
 
-#define MB            1048576 /* 1024*1024 == 2**20 */
-#define GB            1073741824 /* 1024**3 == 2**30 */
-#define TWO_GB_LESS1  2147483647 /* 2**31 - 1 */
+#define MB            1048576     /* 1024*1024 == 2**20 */
+#define GB            1073741824  /* 1024**3 == 2**30 */
+#define TWO_GB_LESS1  2147483647  /* 2**31 - 1 */
 #define FOUR_GB_LESS1 4294967295L /* 2**32 - 1 */
 /*
  * Verify that MPI_Offset exceeding 2**31 can be computed correctly.
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index be3f6e1..1c5e875 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -578,7 +578,7 @@ hs_dr_pio_test__takedown(struct hs_dr_pio_test_vars_t *tv_ptr)
 {
 #if HS_DR_PIO_TEST__TAKEDOWN__DEBUG
     const char *fcnName = "hs_dr_pio_test__takedown()";
-#endif /* HS_DR_PIO_TEST__TAKEDOWN__DEBUG */
+#endif               /* HS_DR_PIO_TEST__TAKEDOWN__DEBUG */
     int    mpi_rank; /* needed by the VRFY macro */
     herr_t ret;      /* Generic return value */
 
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index d1d0d9d..a821e6f 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -37,10 +37,10 @@ enum H5TEST_COLL_CHUNK_API {
 #endif
 
 /* Constants definitions */
-#define DIM0         600 /* Default dataset sizes. */
+#define DIM0         600  /* Default dataset sizes. */
 #define DIM1         1200 /* Values are from a monitor pixel sizes */
-#define ROW_FACTOR   8 /* Nominal row factor for dataset size */
-#define COL_FACTOR   16 /* Nominal column factor for dataset size */
+#define ROW_FACTOR   8    /* Nominal row factor for dataset size */
+#define COL_FACTOR   16   /* Nominal column factor for dataset size */
 #define RANK         2
 #define DATASETNAME1 "Data1"
 #define DATASETNAME2 "Data2"
@@ -94,73 +94,73 @@ enum H5TEST_COLL_CHUNK_API {
 
 /*Constants for MPI derived data type generated from span tree */
 
-#define MSPACE1_RANK 1 /* Rank of the first dataset in memory */
+#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_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 MSPACE_RANK 2
 #define MSPACE_DIM1 9
 #define MSPACE_DIM2 3600
-#define FHCOUNT0    1 /* Count of the first dimension of the first hyperslab selection*/
+#define FHCOUNT0    1   /* Count of the first dimension of the first hyperslab selection*/
 #define FHCOUNT1    768 /* Count of the second dimension of the first hyperslab selection*/
-#define FHSTRIDE0   4 /* Stride of the first dimension of the first hyperslab selection*/
-#define FHSTRIDE1   3 /* Stride of the second dimension of the first hyperslab selection*/
-#define FHBLOCK0    3 /* Block of the first dimension of the first hyperslab selection*/
-#define FHBLOCK1    2 /* Block of the second dimension of the first hyperslab selection*/
-#define FHSTART0    0 /* start of the first dimension of the first hyperslab selection*/
-#define FHSTART1    1 /* start of the second dimension of the first hyperslab selection*/
+#define FHSTRIDE0   4   /* Stride of the first dimension of the first hyperslab selection*/
+#define FHSTRIDE1   3   /* Stride of the second dimension of the first hyperslab selection*/
+#define FHBLOCK0    3   /* Block of the first dimension of the first hyperslab selection*/
+#define FHBLOCK1    2   /* Block of the second dimension of the first hyperslab selection*/
+#define FHSTART0    0   /* start of the first dimension of the first hyperslab selection*/
+#define FHSTART1    1   /* start of the second dimension of the first hyperslab selection*/
 
-#define SHCOUNT0  1 /* Count of the first dimension of the first hyperslab selection*/
-#define SHCOUNT1  1 /* Count of the second dimension of the first hyperslab selection*/
-#define SHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
-#define SHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
-#define SHBLOCK0  3 /* Block of the first dimension of the first hyperslab selection*/
+#define SHCOUNT0  1   /* Count of the first dimension of the first hyperslab selection*/
+#define SHCOUNT1  1   /* Count of the second dimension of the first hyperslab selection*/
+#define SHSTRIDE0 1   /* Stride of the first dimension of the first hyperslab selection*/
+#define SHSTRIDE1 1   /* Stride of the second dimension of the first hyperslab selection*/
+#define SHBLOCK0  3   /* Block of the first dimension of the first hyperslab selection*/
 #define SHBLOCK1  768 /* Block of the second dimension of the first hyperslab selection*/
-#define SHSTART0  4 /* start of the first dimension of the first hyperslab selection*/
-#define SHSTART1  0 /* start of the second dimension of the first hyperslab selection*/
+#define SHSTART0  4   /* start of the first dimension of the first hyperslab selection*/
+#define SHSTART1  0   /* start of the second dimension of the first hyperslab selection*/
 
 #define MHCOUNT0  6912 /* Count of the first dimension of the first hyperslab selection*/
-#define MHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
-#define MHBLOCK0  1 /* Block of the first dimension of the first hyperslab selection*/
-#define MHSTART0  1 /* start of the first dimension of the first hyperslab selection*/
+#define MHSTRIDE0 1    /* Stride of the first dimension of the first hyperslab selection*/
+#define MHBLOCK0  1    /* Block of the first dimension of the first hyperslab selection*/
+#define MHSTART0  1    /* start of the first dimension of the first hyperslab selection*/
 
-#define RFFHCOUNT0  3 /* Count of the first dimension of the first hyperslab selection*/
+#define RFFHCOUNT0  3   /* Count of the first dimension of the first hyperslab selection*/
 #define RFFHCOUNT1  768 /* Count of the second dimension of the first hyperslab selection*/
-#define RFFHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
-#define RFFHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
-#define RFFHBLOCK0  1 /* Block of the first dimension of the first hyperslab selection*/
-#define RFFHBLOCK1  1 /* Block of the second dimension of the first hyperslab selection*/
-#define RFFHSTART0  1 /* start of the first dimension of the first hyperslab selection*/
-#define RFFHSTART1  2 /* start of the second dimension of the first hyperslab selection*/
+#define RFFHSTRIDE0 1   /* Stride of the first dimension of the first hyperslab selection*/
+#define RFFHSTRIDE1 1   /* Stride of the second dimension of the first hyperslab selection*/
+#define RFFHBLOCK0  1   /* Block of the first dimension of the first hyperslab selection*/
+#define RFFHBLOCK1  1   /* Block of the second dimension of the first hyperslab selection*/
+#define RFFHSTART0  1   /* start of the first dimension of the first hyperslab selection*/
+#define RFFHSTART1  2   /* start of the second dimension of the first hyperslab selection*/
 
-#define RFSHCOUNT0  3 /* Count of the first dimension of the first hyperslab selection*/
+#define RFSHCOUNT0  3    /* Count of the first dimension of the first hyperslab selection*/
 #define RFSHCOUNT1  1536 /* Count of the second dimension of the first hyperslab selection*/
-#define RFSHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
-#define RFSHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
-#define RFSHBLOCK0  1 /* Block of the first dimension of the first hyperslab selection*/
-#define RFSHBLOCK1  1 /* Block of the second dimension of the first hyperslab selection*/
-#define RFSHSTART0  2 /* start of the first dimension of the first hyperslab selection*/
-#define RFSHSTART1  4 /* start of the second dimension of the first hyperslab selection*/
+#define RFSHSTRIDE0 1    /* Stride of the first dimension of the first hyperslab selection*/
+#define RFSHSTRIDE1 1    /* Stride of the second dimension of the first hyperslab selection*/
+#define RFSHBLOCK0  1    /* Block of the first dimension of the first hyperslab selection*/
+#define RFSHBLOCK1  1    /* Block of the second dimension of the first hyperslab selection*/
+#define RFSHSTART0  2    /* start of the first dimension of the first hyperslab selection*/
+#define RFSHSTART1  4    /* start of the second dimension of the first hyperslab selection*/
 
-#define RMFHCOUNT0  3 /* Count of the first dimension of the first hyperslab selection*/
+#define RMFHCOUNT0  3   /* Count of the first dimension of the first hyperslab selection*/
 #define RMFHCOUNT1  768 /* Count of the second dimension of the first hyperslab selection*/
-#define RMFHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
-#define RMFHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
-#define RMFHBLOCK0  1 /* Block of the first dimension of the first hyperslab selection*/
-#define RMFHBLOCK1  1 /* Block of the second dimension of the first hyperslab selection*/
-#define RMFHSTART0  0 /* start of the first dimension of the first hyperslab selection*/
-#define RMFHSTART1  0 /* start of the second dimension of the first hyperslab selection*/
+#define RMFHSTRIDE0 1   /* Stride of the first dimension of the first hyperslab selection*/
+#define RMFHSTRIDE1 1   /* Stride of the second dimension of the first hyperslab selection*/
+#define RMFHBLOCK0  1   /* Block of the first dimension of the first hyperslab selection*/
+#define RMFHBLOCK1  1   /* Block of the second dimension of the first hyperslab selection*/
+#define RMFHSTART0  0   /* start of the first dimension of the first hyperslab selection*/
+#define RMFHSTART1  0   /* start of the second dimension of the first hyperslab selection*/
 
-#define RMSHCOUNT0  3 /* Count of the first dimension of the first hyperslab selection*/
+#define RMSHCOUNT0  3    /* Count of the first dimension of the first hyperslab selection*/
 #define RMSHCOUNT1  1536 /* Count of the second dimension of the first hyperslab selection*/
-#define RMSHSTRIDE0 1 /* Stride of the first dimension of the first hyperslab selection*/
-#define RMSHSTRIDE1 1 /* Stride of the second dimension of the first hyperslab selection*/
-#define RMSHBLOCK0  1 /* Block of the first dimension of the first hyperslab selection*/
-#define RMSHBLOCK1  1 /* Block of the second dimension of the first hyperslab selection*/
-#define RMSHSTART0  1 /* start of the first dimension of the first hyperslab selection*/
-#define RMSHSTART1  2 /* start of the second dimension of the first hyperslab selection*/
+#define RMSHSTRIDE0 1    /* Stride of the first dimension of the first hyperslab selection*/
+#define RMSHSTRIDE1 1    /* Stride of the second dimension of the first hyperslab selection*/
+#define RMSHBLOCK0  1    /* Block of the first dimension of the first hyperslab selection*/
+#define RMSHBLOCK1  1    /* Block of the second dimension of the first hyperslab selection*/
+#define RMSHSTART0  1    /* start of the first dimension of the first hyperslab selection*/
+#define RMSHSTART1  2    /* start of the second dimension of the first hyperslab selection*/
 
 #define NPOINTS                                                                                              \
     4 /* Number of points that will be selected                                                              \