diff options
| author | Songyu Lu <songyulu@hdfgroup.org> | 2019-04-22 15:23:38 (GMT) |
|---|---|---|
| committer | Songyu Lu <songyulu@hdfgroup.org> | 2019-04-22 15:23:38 (GMT) |
| commit | 2c47094d4004c916d16667a23efe018db2c0558d (patch) | |
| tree | 3b58f8260550898cf95b8eb2b77f0d6c7efb5dee /test/external_env.c | |
| parent | 500f6cccbd4bfe01b67f2bd02f74df58edef045f (diff) | |
| download | hdf5-2c47094d4004c916d16667a23efe018db2c0558d.zip hdf5-2c47094d4004c916d16667a23efe018db2c0558d.tar.gz hdf5-2c47094d4004c916d16667a23efe018db2c0558d.tar.bz2 | |
Changing file names to avoid possible conflicts during parallel test.
Diffstat (limited to 'test/external_env.c')
| -rw-r--r-- | test/external_env.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/test/external_env.c b/test/external_env.c index 0f8c9ec..a62e085 100644 --- a/test/external_env.c +++ b/test/external_env.c @@ -64,7 +64,7 @@ test_path_env(hid_t fapl) FAIL_STACK_ERROR /* Reset the raw data files */ - if(reset_raw_data_files() < 0) + if(reset_raw_data_files(1) < 0) TEST_ERROR /* Create the dataset */ @@ -73,7 +73,7 @@ test_path_env(hid_t fapl) if(NULL == HDgetcwd(cwdpath, sizeof(cwdpath))) TEST_ERROR for(i = 0; i < N_EXT_FILES; i++) { - HDsnprintf(filename, sizeof(filename), "..%sextern_%dr.raw", H5_DIR_SEPS, (int) i + 1); + HDsnprintf(filename, sizeof(filename), "..%sextern_env_%dr.raw", H5_DIR_SEPS, (int) i + 1); if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0) FAIL_STACK_ERROR } /* end for */ @@ -144,7 +144,6 @@ main(void) hid_t fapl_id_new = -1; /* file access properties (new format) */ hid_t fid = -1; /* file for test_1* functions */ hid_t gid = -1; /* group to emit diagnostics */ - char filename[1024]; /* file name for test_1* funcs */ unsigned latest_format; /* default or latest file format */ int nerrors = 0; /* number of errors */ @@ -152,7 +151,6 @@ main(void) /* Get a fapl for the old (default) file format */ fapl_id_old = h5_fileaccess(); - h5_fixname(EXT_FNAME[0], fapl_id_old, filename, sizeof(filename)); /* Copy and set up a fapl for the latest file format */ if((fapl_id_new = H5Pcopy(fapl_id_old)) < 0) @@ -186,15 +184,15 @@ main(void) /* Clean up files used by file set tests */ if(h5_cleanup(EXT_FNAME, fapl_id_old)) { - HDremove("extern_1r.raw"); - HDremove("extern_2r.raw"); - HDremove("extern_3r.raw"); - HDremove("extern_4r.raw"); - - HDremove("extern_1w.raw"); - HDremove("extern_2w.raw"); - HDremove("extern_3w.raw"); - HDremove("extern_4w.raw"); + HDremove("extern_env_1r.raw"); + HDremove("extern_env_2r.raw"); + HDremove("extern_env_3r.raw"); + HDremove("extern_env_4r.raw"); + + HDremove("extern_env_1w.raw"); + HDremove("extern_env_2w.raw"); + HDremove("extern_env_3w.raw"); + HDremove("extern_env_4w.raw"); HDrmdir("extern_dir"); } /* end if */ |