diff options
| author | kubajj <vilouskubajj@gmail.com> | 2021-03-30 22:04:13 +0200 |
|---|---|---|
| committer | kubajj <vilouskubajj@gmail.com> | 2021-03-30 22:04:13 +0200 |
| commit | 4aff40d0b7bb882cdb0baf784c01552bfb84a843 (patch) | |
| tree | 5cb3913304104fc8c167307478b502e443fd4068 | |
| parent | 7d9a4f6412b3f56d7b52196cbe63a1507e650afc (diff) | |
| download | fpm-4aff40d0b7bb882cdb0baf784c01552bfb84a843.tar.gz fpm-4aff40d0b7bb882cdb0baf784c01552bfb84a843.zip | |
Fix issues created by the merge conflict in test module dependencies
| -rw-r--r-- | fpm/test/fpm_test/test_module_dependencies.f90 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fpm/test/fpm_test/test_module_dependencies.f90 b/fpm/test/fpm_test/test_module_dependencies.f90 index fe92aab..021375b 100644 --- a/fpm/test/fpm_test/test_module_dependencies.f90 +++ b/fpm/test/fpm_test/test_module_dependencies.f90 @@ -40,8 +40,6 @@ contains test_missing_program_use, should_fail=.true.), & & new_unittest("invalid-library-use", & test_invalid_library_use, should_fail=.true.), & - & new_unittest("invalid-own-module-use", & - test_invalid_own_module_use, should_fail=.true.), & & new_unittest("package-with-no-duplicates", & test_package_with_no_module_duplicates), & & new_unittest("package-with-duplicates-in-same-source", & @@ -404,6 +402,8 @@ contains uses=[string_t('app_mod')]) call targets_from_sources(targets,model,error) + + end subroutine test_subdirectory_module_use !> Check program with no duplicate modules subroutine test_package_with_no_module_duplicates(error) @@ -411,7 +411,7 @@ contains type(error_t), allocatable, intent(out) :: error type(fpm_model_t) :: model - logical :: duplicates_found + logical :: duplicates_found = .false. allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -498,8 +498,6 @@ contains return end if end subroutine test_package_module_duplicates_two_packages - - end subroutine test_subdirectory_module_use !> Check program using a non-library module in a differente sub-directory subroutine test_invalid_subdirectory_module_use(error) |