From 5ed622b9ca432f1b440e8903680695ac83e28301 Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Thu, 20 Apr 2017 16:11:47 -0400
Subject: The cache_image test shows a skipped message about EoC in parallel.

---
 src/H5Pfapl.c         |  1 -
 test/cache_image.c    | 18 +++++++++---------
 test/evict_on_close.c |  1 -
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 8bd53a9..e47a4b0 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -4401,7 +4401,6 @@ H5Pset_evict_on_close(
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ib", fapl_id, evict_on_close);
 
-
     /* Compare the property list's class against the other class */
     if(TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "property list is not a file access plist")
diff --git a/test/cache_image.c b/test/cache_image.c
index 31d7705..378c21e 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -62,10 +62,7 @@ static unsigned cache_image_api_error_check_3(void);
 static unsigned cache_image_api_error_check_4(void);
 
 static unsigned get_free_sections_test(void);
-
-#ifndef H5_HAVE_PARALLEL
 static unsigned evict_on_close_test(void);
-#endif /* H5_HAVE_PARALLEL */
 
 
 /****************************************************************************/
@@ -7714,10 +7711,10 @@ get_free_sections_test(void)
  *
  *-------------------------------------------------------------------------
  */
-#ifndef H5_HAVE_PARALLEL
 static unsigned
 evict_on_close_test(void)
 {
+#ifndef H5_HAVE_PARALLEL
     const char * fcn_name = "evict_on_close_test()";
     char filename[512];
     hbool_t show_progress = FALSE;
@@ -7726,9 +7723,16 @@ evict_on_close_test(void)
     H5F_t *file_ptr = NULL;
     H5C_t *cache_ptr = NULL;
     int cp = 0;
+#endif /* H5_HAVE_PARALLEL */
 
     TESTING("Cache image / evict on close interaction");
 
+#ifdef H5_HAVE_PARALLEL
+    SKIPPED();
+    HDputs("    EoC not supported in the parallel library.");
+    return 0;
+#else
+
     pass = TRUE;
 
     if ( show_progress ) 
@@ -8017,9 +8021,9 @@ evict_on_close_test(void)
                   FUNC, failure_mssg);
 
     return !pass;
+#endif /* H5_HAVE_PARALLEL */
 
 } /* evict_on_close_test() */
-#endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
@@ -8071,13 +8075,9 @@ main(void)
     nerrs += cache_image_api_error_check_4();
 
     nerrs += get_free_sections_test();
-
-#ifndef H5_HAVE_PARALLEL
     nerrs += evict_on_close_test();
-#endif /* H5_HAVE_PARALLEL */
 
     return(nerrs > 0);
 
 } /* main() */
 
-
diff --git a/test/evict_on_close.c b/test/evict_on_close.c
index 8196ea1..147976b 100644
--- a/test/evict_on_close.c
+++ b/test/evict_on_close.c
@@ -808,7 +808,6 @@ error:
 
 } /* check_dset_scheme() */
 
-
 
 /*-------------------------------------------------------------------------
  * Function:    check_evict_on_close_api()
-- 
cgit v0.12