Skip to content

Commit e0d336c

Browse files
committed
Print filename when duplicate found and remove duplicate test call
1 parent 4aff40d commit e0d336c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

fpm/src/fpm.f90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ subroutine check_modules_for_duplicates(model, duplicates_found)
220220
if (allocated(model%packages(k)%sources(l)%modules_provided)) then
221221
do m=1,size(model%packages(k)%sources(l)%modules_provided)
222222
if (model%packages(k)%sources(l)%modules_provided(m)%s.in.modules(:modi-1)) then
223-
write(error_unit, *) "Warning: Module ",model%packages(k)%sources(l)%modules_provided(m)%s," is a duplicate"
223+
write(error_unit, *) "Warning: Module ",model%packages(k)%sources(l)%modules_provided(m)%s, &
224+
" in ",model%packages(k)%sources(l)%file_name," is a duplicate"
224225
duplicates_found = .true.
225226
else
226227
modules(modi) = model%packages(k)%sources(l)%modules_provided(m)

fpm/test/fpm_test/test_module_dependencies.f90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ subroutine collect_module_dependencies(testsuite)
4444
test_package_with_no_module_duplicates), &
4545
& new_unittest("package-with-duplicates-in-same-source", &
4646
test_package_module_duplicates_same_source, should_fail=.true.), &
47-
& new_unittest("package-with-duplicates-in-same-source", &
48-
test_package_module_duplicates_same_source, should_fail=.true.), &
4947
& new_unittest("package-with-duplicates-in-one-package", &
5048
test_package_module_duplicates_one_package, should_fail=.true.), &
5149
& new_unittest("package-with-duplicates-in-two-packages", &

0 commit comments

Comments
 (0)