Inject tmp folder so tests don't use the same one

Author: minhqdao

src/stdlib_io_np.fypp

@@ -121,11 +121,12 @@ module stdlib_io_np
     !> Load multiple multidimensional arrays from a (compressed) npz file.
     !> ([Specification](../page/specs/stdlib_io.html#load_npz))
     interface load_npz
-        module subroutine load_npz_to_arrays(filename, arrays, iostat, iomsg)
+        module subroutine load_npz_to_arrays(filename, arrays, iostat, iomsg, tmp_dir)
             character(len=*), intent(in) :: filename
             type(t_array_wrapper), allocatable, intent(out) :: arrays(:)
             integer, intent(out), optional :: iostat
             character(len=:), allocatable, intent(out), optional :: iomsg
+            character(len=*), intent(in), optional :: tmp_dir
         end
     end interface
 

src/stdlib_io_np_load.fypp

@@ -9,7 +9,7 @@ submodule(stdlib_io_np) stdlib_io_np_load
     use stdlib_array
     use stdlib_error, only: error_stop
     use stdlib_filesystem, only: exists, list_dir, temp_dir
-    use stdlib_io_zip, only: unzip, unzipped_folder, zip_contents
+    use stdlib_io_zip, only: unzip, default_unzip_dir, zip_contents
     use stdlib_strings, only: to_string, starts_with
     use stdlib_string_type, only: string_type, as_string => char
     implicit none
@@ -105,33 +105,39 @@ contains
     !>
     !> Load multidimensional arrays from a compressed or uncompressed npz file.
     !> ([Specification](../page/specs/stdlib_io.html#load_npz))
-    module subroutine load_npz_to_arrays(filename, arrays, iostat, iomsg)
+    module subroutine load_npz_to_arrays(filename, arrays, iostat, iomsg, tmp_dir)
         character(len=*), intent(in) :: filename
         type(t_array_wrapper), allocatable, intent(out) :: arrays(:)
         integer, intent(out), optional :: iostat
         character(len=:), allocatable, intent(out), optional :: iomsg
+        character(*), intent(in), optional :: tmp_dir
 
         integer :: stat
-        character(len=:), allocatable :: msg
+        character(len=:), allocatable :: msg, unzip_dir
         type(string_type), allocatable :: files(:)
 
         if (present(iostat)) iostat = 0
+        if (present(tmp_dir)) then
+            unzip_dir = tmp_dir
+        else
+            unzip_dir = default_unzip_dir
+        end if
 
-        call unzip(filename, unzipped_folder, stat, msg)
+        call unzip(filename, unzip_dir, stat, msg)
         if (stat /= 0) then
             if (present(iostat)) iostat = stat
             if (present(iomsg) .and. allocated(msg)) call move_alloc(msg, iomsg)
             return
         end if
 
-        call list_dir(unzipped_folder, files, stat, msg)
+        call list_dir(unzip_dir, files, stat, msg)
         if (stat /= 0) then
             if (present(iostat)) iostat = stat
             if (present(iomsg) .and. allocated(msg)) call move_alloc(msg, iomsg)
             return
         end if
 
-        call load_unzipped_files_to_arrays(files, unzipped_folder, arrays, stat, msg)
+        call load_unzipped_files_to_arrays(files, unzip_dir, arrays, stat, msg)
         if (stat /= 0) then
             if (present(iostat)) iostat = stat
             if (present(iomsg) .and. allocated(msg)) call move_alloc(msg, iomsg)

src/stdlib_io_zip.f90

@@ -3,10 +3,10 @@ module stdlib_io_zip
     implicit none
     private
 
-    public :: unzip, unzipped_folder, zip_contents
+    public :: unzip, default_unzip_dir, zip_contents
 
-    character(*), parameter :: unzipped_folder = temp_dir//'/unzipped_files'
-    character(*), parameter :: zip_contents = unzipped_folder//'/zip_contents.txt'
+    character(*), parameter :: default_unzip_dir = temp_dir//'/unzipped_files'
+    character(*), parameter :: zip_contents = default_unzip_dir//'/zip_contents.txt'
 
 contains
 
@@ -22,16 +22,16 @@ subroutine unzip(filename, outputdir, stat, msg)
         if (present(outputdir)) then
             output_dir = outputdir
         else
-            output_dir = unzipped_folder
+            output_dir = default_unzip_dir
         end if
 
         if (present(stat)) stat = 0
         run_stat = 0
 
-        call run('rm -rf '//unzipped_folder, run_stat)
+        call run('rm -rf '//default_unzip_dir, run_stat)
         if (run_stat /= 0) then
             if (present(stat)) stat = run_stat
-            if (present(msg)) msg = "Error removing folder '"//unzipped_folder//"'."
+            if (present(msg)) msg = "Error removing folder '"//default_unzip_dir//"'."
             return
         end if
 
@@ -44,7 +44,7 @@ subroutine unzip(filename, outputdir, stat, msg)
             end if
         end if
 
-        call run('unzip '//filename//' -d '//unzipped_folder, run_stat)
+        call run('unzip '//filename//' -d '//output_dir, run_stat)
         if (run_stat /= 0) then
             if (present(stat)) stat = run_stat
             if (present(msg)) msg = "Error unzipping '"//filename//"'."

test/io/test_np.f90

@@ -1,5 +1,6 @@
 module test_np
     use stdlib_array
+    use stdlib_filesystem, only : temp_dir
     use stdlib_kinds, only : int8, int16, int32, int64, sp, dp
     use stdlib_io_np, only : save_npy, load_npy, load_npz
     use testdrive, only : new_unittest, unittest_type, error_type, check, test_failed
@@ -659,9 +660,10 @@ subroutine npz_load_nonexistent_file(error)
         type(t_array_wrapper), allocatable :: arrays(:)
 
         integer :: stat
-        character(len=*), parameter :: filename = "nonexistent.npz"
+        character(*), parameter :: filename = "nonexistent.npz"
+        character(*), parameter :: tmp = temp_dir//"nonexistent"
 
-        call load_npz(filename, arrays, stat)
+        call load_npz(filename, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Loading a non-existent npz file should fail.")
     end
 
@@ -672,9 +674,11 @@ subroutine npz_load_invalid_dir(error)
         type(t_array_wrapper), allocatable :: arrays(:)
 
         integer :: stat
-        character(len=*), parameter :: filename = "."
+        character(*), parameter :: filename = "."
+        character(*), parameter :: tmp = temp_dir//"invalid_dir"
 
-        call load_npz(filename, arrays, stat)
+
+        call load_npz(filename, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "A file name that points towards a directory should fail.")
     end
 
@@ -686,11 +690,12 @@ subroutine npz_load_empty_file(error)
 
         integer :: io, stat
         character(*), parameter :: filename = "empty_file"
+        character(*), parameter :: tmp = temp_dir//"empty_file"
 
         open(newunit=io, file=filename)
         close(io)
 
-        call load_npz(filename, arrays, stat)
+        call load_npz(filename, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Try loading an empty file as an npz file should fail.")
 
         call delete_file(filename)
@@ -704,13 +709,14 @@ subroutine npz_load_empty_zip(error)
         integer :: io, stat
 
         character(*), parameter :: filename = "empty.zip"
+        character(*), parameter :: tmp = temp_dir//"empty_zip"
         character(*), parameter:: binary_data = 'PK'//char(5)//char(6)//repeat(char(0), 18)
 
         open (newunit=io, file=filename, form='unformatted', access='stream')
         write (io) binary_data
         close (io)
 
-        call load_npz(filename, arrays, stat)
+        call load_npz(filename, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Trying to load an npz file that is an empty zip file should fail.")
 
         call delete_file(filename)
@@ -722,10 +728,12 @@ subroutine npz_load_arr_empty_0(error)
         type(t_array_wrapper), allocatable :: arrays(:)
         integer :: stat
         character(*), parameter :: filename = "empty_0.npz"
+        character(*), parameter :: tmp = temp_dir//"empty_0"
         character(:), allocatable :: path
 
+
         path = get_path(filename)
-        call load_npz(path, arrays, stat)
+        call load_npz(path, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Loading an npz that contains a single empty array shouldn't fail.")
         if (stat /= 0) return
         call check(error, size(arrays) == 1, "'"//filename//"' is supposed to contain a single array.")
@@ -746,10 +754,11 @@ subroutine npz_load_arr_rand_2_3(error)
         type(t_array_wrapper), allocatable :: arrays(:)
         integer :: stat
         character(*), parameter :: filename = "rand_2_3.npz"
+        character(*), parameter :: tmp = temp_dir//"rand_2_3"
         character(:), allocatable :: path
 
         path = get_path(filename)
-        call load_npz(path, arrays, stat)
+        call load_npz(path, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Loading an npz file that contains a valid nd_array shouldn't fail.")
         if (stat /= 0) return
         call check(error, size(arrays) == 1, "'"//filename//"' is supposed to contain a single array.")
@@ -770,10 +779,12 @@ subroutine npz_load_arr_arange_10_20(error)
         type(t_array_wrapper), allocatable :: arrays(:)
         integer :: stat, i
         character(*), parameter :: filename = "arange_10_20.npz"
+        character(*), parameter :: tmp = temp_dir//"arange_10_20"
+
         character(:), allocatable :: path
 
         path = get_path(filename)
-        call load_npz(path, arrays, stat)
+        call load_npz(path, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Loading an npz file that contains a valid nd_array shouldn't fail.")
         if (stat /= 0) return
         call check(error, size(arrays) == 1, "'"//filename//"' is supposed to contain a single array.")
@@ -801,10 +812,11 @@ subroutine npz_load_arr_cmplx(error)
         type(t_array_wrapper), allocatable :: arrays(:)
         integer :: stat
         character(*), parameter :: filename = "cmplx_arr.npz"
+        character(*), parameter :: tmp = temp_dir//"cmplx_arr"
         character(:), allocatable :: path
 
         path = get_path(filename)
-        call load_npz(path, arrays, stat)
+        call load_npz(path, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Loading an npz file that contains a valid nd_array shouldn't fail.")
         if (stat /= 0) return
         call check(error, size(arrays) == 1, "'"//filename//"' is supposed to contain a single array.")
@@ -832,10 +844,11 @@ subroutine npz_load_two_arr_iint64_rdp(error)
         type(t_array_wrapper), allocatable :: arrays(:)
         integer :: stat
         character(*), parameter :: filename = "two_arr_iint64_rdp.npz"
+        character(*), parameter :: tmp = temp_dir//"two_arr_iint64_rdp"
         character(:), allocatable :: path
 
         path = get_path(filename)
-        call load_npz(path, arrays, stat)
+        call load_npz(path, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Loading an npz file that contains valid nd_arrays shouldn't fail.")
         if (stat /= 0) return
         call check(error, size(arrays) == 2, "'"//filename//"' is supposed to contain two arrays.")
@@ -878,10 +891,11 @@ subroutine npz_load_two_arr_iint64_rdp_comp(error)
         type(t_array_wrapper), allocatable :: arrays(:)
         integer :: stat, i
         character(*), parameter :: filename = "two_arr_iint64_rdp_comp.npz"
+        character(*), parameter :: tmp = temp_dir//"two_arr_iint64_rdp_comp"
         character(:), allocatable :: path
 
         path = get_path(filename)
-        call load_npz(path, arrays, stat)
+        call load_npz(path, arrays, stat, tmp_dir=tmp)
         call check(error, stat, "Loading a compressed npz file that contains valid nd_arrays shouldn't fail.")
         if (stat /= 0) return
         call check(error, size(arrays) == 2, "'"//filename//"' is supposed to contain two arrays.")