From acd98cbe56f8f0898aca2f82c399f11113ac269d Mon Sep 17 00:00:00 2001 From: Hyo-Kyung Lee Date: Mon, 25 Sep 2023 11:17:19 -0500 Subject: [PATCH 1/3] Remove sh to run bash script. --- testpar/t_subfiling_vfd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 7d0665d45bd..0a8293839d5 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -1939,12 +1939,11 @@ test_subfiling_h5fuse(void) SUBF_FILENAME, file_inode); args[0] = strdup("env"); - args[1] = strdup("sh"); - args[2] = strdup("h5fuse.sh"); - args[3] = strdup("-q"); - args[4] = strdup("-f"); - args[5] = tmp_filename; - args[6] = NULL; + args[1] = strdup("./h5fuse.sh"); + args[2] = strdup("-q"); + args[3] = strdup("-f"); + args[4] = tmp_filename; + args[5] = NULL; /* Call h5fuse script from MPI rank 0 */ execvp("env", args); @@ -2347,7 +2346,8 @@ main(int argc, char **argv) must_unset_ioc_thread_count_env = true; } - if (!(env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) { + env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX); + if (NULL != env_value) { int rand_value = 0; if (MAINPROCESS) From 6c9ef47e82a40f20c8aa82bfbbfd0e588cc8d475 Mon Sep 17 00:00:00 2001 From: Hyo-Kyung Lee Date: Mon, 25 Sep 2023 11:25:08 -0500 Subject: [PATCH 2/3] Address @byrnHDF review from PR #3583 --- testpar/t_subfiling_vfd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 0a8293839d5..7c13009db29 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -2120,7 +2120,6 @@ main(int argc, char **argv) bool must_unset_ioc_per_node_env = false; bool must_unset_ioc_thread_count_env = false; bool must_unset_config_dir_env = false; - char *env_value = NULL; int required = MPI_THREAD_MULTIPLE; int provided = 0; @@ -2346,8 +2345,7 @@ main(int argc, char **argv) must_unset_ioc_thread_count_env = true; } - env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX); - if (NULL != env_value) { + if (NULL != HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX)) { int rand_value = 0; if (MAINPROCESS) From d7dc17824885793dff36cdfd5467d15bef5ea14a Mon Sep 17 00:00:00 2001 From: Hyo-Kyung Lee Date: Mon, 25 Sep 2023 13:23:36 -0500 Subject: [PATCH 3/3] Address @jhendersonHDF review. --- testpar/t_subfiling_vfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 7c13009db29..2d1f50fc1ad 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -2345,7 +2345,7 @@ main(int argc, char **argv) must_unset_ioc_thread_count_env = true; } - if (NULL != HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX)) { + if (NULL == HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX)) { int rand_value = 0; if (MAINPROCESS)