diff options
| author | raylu-hdf <60487644+raylu-hdf@users.noreply.github.com> | 2021-04-13 16:48:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 16:48:02 (GMT) |
| commit | d9e9fe017c8f9a529f967869546d92dba4559b8f (patch) | |
| tree | 3d280445045b44d7bbec6bd68f79e3fb82e5921a /test/testvfdswmr.sh.in | |
| parent | 4fc1dacf9ef476fc9e1dbcdb2b49167ea04ae31f (diff) | |
| parent | 95718b27fddb8f5d8fe6216b021acba400407cda (diff) | |
| download | hdf5-d9e9fe017c8f9a529f967869546d92dba4559b8f.zip hdf5-d9e9fe017c8f9a529f967869546d92dba4559b8f.tar.gz hdf5-d9e9fe017c8f9a529f967869546d92dba4559b8f.tar.bz2 | |
Merge pull request #436 from raylu-hdf/raylu_zoo_test
Changed the signal handling to named pipes in the zoo test
Diffstat (limited to 'test/testvfdswmr.sh.in')
| -rw-r--r-- | test/testvfdswmr.sh.in | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/testvfdswmr.sh.in b/test/testvfdswmr.sh.in index e8ead12..28860ca 100644 --- a/test/testvfdswmr.sh.in +++ b/test/testvfdswmr.sh.in @@ -575,16 +575,16 @@ done # read and written by VFD SWMR. # if [ ${do_zoo:-no} = yes ]; then - [ -e ./fifo ] && rm -f ./fifo - mkfifo -m 0600 ./fifo rm -f ./shared_tick_num echo launch vfd_swmr_zoo_writer - STDIN_PATH="./fifo" catch_out_err_and_rc vfd_swmr_zoo_writer \ - ../vfd_swmr_zoo_writer -m 1000 -q & + catch_out_err_and_rc vfd_swmr_zoo_writer \ + ../vfd_swmr_zoo_writer -q & pid_writer=$! - STDOUT_PATH="./fifo" catch_out_err_and_rc vfd_swmr_zoo_reader \ - ../vfd_swmr_zoo_reader -q -W & + # -l is the expected maximal number of ticks from the writer's finishing zoo creation or deletion + # to the reader's finishing validation of zoo creation or deletion + catch_out_err_and_rc vfd_swmr_zoo_reader \ + ../vfd_swmr_zoo_reader -l 4 -q & pid_reader=$! # Wait for the reader to finish before signalling the @@ -592,7 +592,6 @@ if [ ${do_zoo:-no} = yes ]; then # reader will find the shadow file when it opens # the .h5 file. wait $pid_reader - kill -USR1 $(cat vfd_swmr_zoo_writer.pid) wait $pid_writer # Collect exit code of the reader @@ -608,7 +607,6 @@ if [ ${do_zoo:-no} = yes ]; then fi # Clean up output files - rm -f ./fifo rm -f vfd_swmr_zoo_writer.{out,rc} rm -f vfd_swmr_zoo_reader.*.{out,rc} fi |