Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit 'd14b96e95976967c03c7623f6800506b89292656':
  Modify external_env.c to prevent deleting test file of external.c. Fix for HDFFV-10941.
This commit is contained in:
Allen Byrne 2020-01-10 08:21:48 -06:00
commit 1e70eb845a

View File

@ -15,7 +15,6 @@
* Purpose: Tests datasets stored in external raw files.
*/
#include "external_common.h"
#include "external_fname.h"
static const char *EXT_ENV_FNAME[] = {
"extern_env_dir/env_file_1",
@ -189,7 +188,7 @@ main(void)
HDputs("All external storage tests passed.");
/* Clean up files used by file set tests */
if(h5_cleanup(EXT_FNAME, fapl_id_old)) {
if(h5_cleanup(EXT_ENV_FNAME, fapl_id_old)) {
HDremove("extern_env_1r.raw");
HDremove("extern_env_2r.raw");
HDremove("extern_env_3r.raw");