Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove sh to run bash script. #3590

Merged
merged 4 commits into from
Sep 26, 2023
Merged

Remove sh to run bash script. #3590

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acd98cb
Remove sh to run bash script.
hyoklee Sep 25, 2023
6c9ef47
Address @byrnHDF review from PR #3583
hyoklee Sep 25, 2023
d7dc178
Address @jhendersonHDF review.
hyoklee Sep 25, 2023
ae19008
Merge branch 'develop' into hyoklee-hdf5-77
brtnfld Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions testpar/t_subfiling_vfd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -2121,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;

Expand Down Expand Up @@ -2347,7 +2345,7 @@ main(int argc, char **argv)
must_unset_ioc_thread_count_env = true;
}

if (!(env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) {
if (NULL != HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the opposite logic. It should be if (!HDgetenv(...))

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@derobins, I think this was merged without this needed change.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like @hyoklee got the correct change in, just in a different form.

int rand_value = 0;

if (MAINPROCESS)
Expand Down