Skip to content

Commit 4aff40d

Browse files
committed
Fix issues created by the merge conflict in test module dependencies
1 parent 7d9a4f6 commit 4aff40d

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

fpm/test/fpm_test/test_module_dependencies.f90

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ subroutine collect_module_dependencies(testsuite)
4040
test_missing_program_use, should_fail=.true.), &
4141
& new_unittest("invalid-library-use", &
4242
test_invalid_library_use, should_fail=.true.), &
43-
& new_unittest("invalid-own-module-use", &
44-
test_invalid_own_module_use, should_fail=.true.), &
4543
& new_unittest("package-with-no-duplicates", &
4644
test_package_with_no_module_duplicates), &
4745
& new_unittest("package-with-duplicates-in-same-source", &
@@ -404,14 +402,16 @@ subroutine test_subdirectory_module_use(error)
404402
uses=[string_t('app_mod')])
405403

406404
call targets_from_sources(targets,model,error)
405+
406+
end subroutine test_subdirectory_module_use
407407

408408
!> Check program with no duplicate modules
409409
subroutine test_package_with_no_module_duplicates(error)
410410

411411
type(error_t), allocatable, intent(out) :: error
412412

413413
type(fpm_model_t) :: model
414-
logical :: duplicates_found
414+
logical :: duplicates_found = .false.
415415

416416
allocate(model%packages(1))
417417
allocate(model%packages(1)%sources(2))
@@ -498,8 +498,6 @@ subroutine test_package_module_duplicates_two_packages(error)
498498
return
499499
end if
500500
end subroutine test_package_module_duplicates_two_packages
501-
502-
end subroutine test_subdirectory_module_use
503501

504502
!> Check program using a non-library module in a differente sub-directory
505503
subroutine test_invalid_subdirectory_module_use(error)

0 commit comments

Comments
 (0)