Undo changes to onion files in gentest

Author: mattjala

tools/test/h5dump/h5dumpgentest.c

@@ -11625,18 +11625,12 @@ gent_onion_1d_dset(void)
 
     /* Setup */
     onion_info.backing_fapl_id = H5Pcreate(H5P_FILE_ACCESS);
-    /* Force onion files to be generated via Native connector */
-    if (H5Pset_vol(onion_info.backing_fapl_id, H5VL_NATIVE, NULL) < 0)
-        goto error;
 
     if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
     if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0)
         goto error;
 
-    /* Force onion files to be generated via Native connector */
-    if (H5Pset_vol(fapl_id, H5VL_NATIVE, NULL) < 0)
-        goto error;
     if ((paths = onion_filepaths_init(FILE90)) == NULL)
         goto error;
 
@@ -11817,16 +11811,10 @@ gent_onion_create_delete_objects(void)
     /* Set up */
     if ((onion_info.backing_fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
-    /* Force onion files to be generated via Native connector */
-    if (H5Pset_vol(onion_info.backing_fapl_id, H5VL_NATIVE, NULL) < 0)
-        goto error;
     if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
     if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0)
         goto error;
-    /* Force onion files to be generated via Native connector */
-    if (H5Pset_vol(fapl_id, H5VL_NATIVE, NULL) < 0)
-        goto error;
 
     if ((paths = onion_filepaths_init(FILE91)) == NULL)
         goto error;
@@ -11843,17 +11831,6 @@ gent_onion_create_delete_objects(void)
         for (int j = 0; j < 4; j++)
             wdata[i][j] = i + j;
 
-    /* Ensure that the onion file does not exist, to avoid tracking revisions across multiple test runs */
-    strcpy(onion_revfile_path, paths->canon);
-    strcat(onion_revfile_path, ".onion");
-
-    if (access(onion_revfile_path, F_OK) == 0) {
-        if (remove(onion_revfile_path) != 0) {
-            printf("Error: could not delete onion file %s\n", onion_revfile_path);
-            goto error;
-        }
-    }
-
     /*
      * Create a new file using the default properties.
      */
@@ -12081,17 +12058,11 @@ gent_onion_dset_extension(void)
     /* Setup */
     if ((onion_info.backing_fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
-    /* Force onion files to be operated on via Native connector */
-    if (H5Pset_vol(onion_info.backing_fapl_id, H5VL_NATIVE, NULL) < 0)
-        goto error;
     if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
 
     if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0)
         goto error;
-    /* Force onion files to be operated on via Native connector */
-    if (H5Pset_vol(fapl_id, H5VL_NATIVE, NULL) < 0)
-        goto error;
 
     if ((paths = onion_filepaths_init(FILE92)) == NULL)
         goto error;