From e5b602fafe301d9ab8fa1c870ab18fd59c03370c Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 6 Mar 2018 15:40:15 -0600 Subject: Add #ifdef H5_HAVE_FORK --- testpar/t_cache_image.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index 7fe0020..d23548a 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -4056,6 +4056,13 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) } /* smoke_check_1() */ +/* This test uses many POSIX things that are not available on + * Windows. We're using a check for fork(2) here as a proxy for + * all POSIX/Unix/Linux things until this test can be made + * more platform-independent. + */ +#ifdef H5_HAVE_FORK + /*------------------------------------------------------------------------- * Function: main * @@ -4271,4 +4278,14 @@ finish: return(nerrs > 0); } /* main() */ +#else /* H5_HAVE_FORK */ + +int +main(void) +{ + HDfprintf(stderr, "Non-POSIX platform. Skipping.\n"); + return EXIT_SUCCESS; +} /* end main() */ + +#endif /* H5_HAVE_FORK */ -- cgit v0.12 From b8b0afc4c3e532c07c1284eddb0c5cb7834ea86a Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 6 Mar 2018 15:41:51 -0600 Subject: Add #ifdef H5_HAVE_FORK eliminates special handling --- testpar/CMakeTests.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake index cd9acda..87470f3 100644 --- a/testpar/CMakeTests.cmake +++ b/testpar/CMakeTests.cmake @@ -18,10 +18,6 @@ add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -if (WIN32) - # t_cache_imagee uses fork() and execve(), will not run on Windows - list (REMOVE_ITEM H5P_TESTS t_cache_image) -endif () foreach (testp ${H5P_TESTS}) add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) endforeach () -- cgit v0.12