Merge pull request #1692 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

* commit '8a4f679fda20577c4528977d0ee9a7e4c5bee055':
  Combine "collective group and dataset write" and "independent group and dataset read" tests into one test.  The second test is dependent on the file created by the first test, and will not pass when run by itself.

4 files changed, 13 insertions, 6 deletions

diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake
index 4b738c1..b4c8111 100644
--- a/testpar/CMakeTests.cmake
+++ b/testpar/CMakeTests.cmake
@@ -33,8 +33,7 @@ set (SKIP_tests
     ecdsetw
     eidsetw2
     selnone
-    cngrpw
-    ingrpr
+    cngrpw-ingrpr
     cschunkw
     ccchunkw
     tldsc
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 16eb13c..7f75d20 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -838,6 +838,13 @@ void dataset_fillvalue(void)
     HDfree(wdata);
 }
 
+/* combined cngrpw and ingrpr tests because ingrpr reads file created by cngrpw. */
+void collective_group_write_independent_group_read(void)
+{
+    collective_group_write();
+    independent_group_read();
+}
+
 /* Write multiple groups with a chunked dataset in each group collectively.
  * These groups and datasets are for testing independent read later.
  *
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 4269066..e1ccbed 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -409,10 +409,10 @@ int main(int argc, char **argv)
 
     collngroups_params.name = PARATESTFILE;
     collngroups_params.count = ngroups;
-    AddTest("cngrpw", collective_group_write, NULL,
-        "collective group and dataset write", &collngroups_params);
-    AddTest("ingrpr", independent_group_read, NULL,
-        "independent group and dataset read", &collngroups_params);
+    /* combined cngrpw and ingrpr tests because ingrpr reads file created by cngrpw. */
+    AddTest("cngrpw-ingrpr", collective_group_write_independent_group_read, NULL,
+            "collective grp/dset write - independent grp/dset read",
+            &collngroups_params);
 #ifndef H5_HAVE_WIN32_API
     AddTest("bigdset", big_dataset, NULL,
             "big dataset test", PARATESTFILE);
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index 4409221..9fece12 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -240,6 +240,7 @@ void test_file_properties(void);
 void multiple_dset_write(void);
 void multiple_group_write(void);
 void multiple_group_read(void);
+void collective_group_write_independent_group_read(void);
 void collective_group_write(void);
 void independent_group_read(void);
 void test_fapl_mpio_dup(void);