diff options
| author | Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> | 2021-10-10 18:03:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-10 18:03:37 +0200 |
| commit | df9b01a652a37b968e29d32c24f3c690f130e890 (patch) | |
| tree | 51cecbcf3e2b6b5435e1006e988555415f0ef85e /test | |
| parent | d129243af8dbff5ff5771bea8162699743c2aca7 (diff) | |
| parent | 6f816ad20ffe8897feec9a8a91ab8c7bf1d2d753 (diff) | |
| download | fpm-df9b01a652a37b968e29d32c24f3c690f130e890.tar.gz fpm-df9b01a652a37b968e29d32c24f3c690f130e890.zip | |
Merge pull request #575 from awvwgk/build-dirs
Enable multiple build output directories
Diffstat (limited to 'test')
| -rw-r--r-- | test/fpm_test/test_backend.f90 | 5 | ||||
| -rw-r--r-- | test/fpm_test/test_module_dependencies.f90 | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/test/fpm_test/test_backend.f90 b/test/fpm_test/test_backend.f90 index eea0460..cb8d6c8 100644 --- a/test/fpm_test/test_backend.f90 +++ b/test/fpm_test/test_backend.f90 @@ -328,6 +328,7 @@ contains function new_test_package() result(targets) type(build_target_ptr), allocatable :: targets(:) + integer :: i call add_target(targets,FPM_TARGET_ARCHIVE,get_temp_filename()) @@ -347,6 +348,10 @@ contains call add_dependency(targets(2)%ptr,targets(4)%ptr) call add_dependency(targets(3)%ptr,targets(4)%ptr) + do i = 1, size(targets) + targets(i)%ptr%output_file = targets(i)%ptr%output_name + end do + end function new_test_package diff --git a/test/fpm_test/test_module_dependencies.f90 b/test/fpm_test/test_module_dependencies.f90 index 8600bf0..53256be 100644 --- a/test/fpm_test/test_module_dependencies.f90 +++ b/test/fpm_test/test_module_dependencies.f90 @@ -66,7 +66,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -136,7 +135,6 @@ contains type(build_target_ptr), allocatable :: targets(:) character(:), allocatable :: scope_str - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -195,7 +193,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(1)) @@ -249,7 +246,6 @@ contains type(build_target_ptr), allocatable :: targets(:) character(:), allocatable :: scope_str - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(3)) @@ -309,7 +305,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -337,7 +332,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -364,7 +358,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -392,7 +385,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -512,7 +504,6 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) |