diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-03-06 21:57:16 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-03-06 21:57:16 (GMT) |
| commit | cad9a3376061dd76287a9a8356f08aa55f00b721 (patch) | |
| tree | 396d9dae5054d23d2ece0817cfc86f09464d9b01 | |
| parent | d8f88eb7b8709a80981e04cb5671a1a17ef66da0 (diff) | |
| parent | b8b0afc4c3e532c07c1284eddb0c5cb7834ea86a (diff) | |
| download | hdf5-cad9a3376061dd76287a9a8356f08aa55f00b721.zip hdf5-cad9a3376061dd76287a9a8356f08aa55f00b721.tar.gz hdf5-cad9a3376061dd76287a9a8356f08aa55f00b721.tar.bz2 | |
Merge pull request #923 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b8b0afc4c3e532c07c1284eddb0c5cb7834ea86a':
Add #ifdef H5_HAVE_FORK eliminates special handling
Add #ifdef H5_HAVE_FORK
| -rw-r--r-- | testpar/CMakeTests.cmake | 4 | ||||
| -rw-r--r-- | testpar/t_cache_image.c | 17 |
2 files changed, 17 insertions, 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} $<TARGET_FILE:testphdf5> ${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} $<TARGET_FILE:${testp}> ${MPIEXEC_POSTFLAGS}) endforeach () 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 */ |