Skip to content

Commit ee33e8a

Browse files
authored
fix unallocated model variables in the testsuite (#844) (#845)
1 parent 5efb9e0 commit ee33e8a

File tree

1 file changed

+64
-3
lines changed

1 file changed

+64
-3
lines changed

test/fpm_test/test_module_dependencies.f90

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ subroutine collect_module_dependencies(testsuite)
5252
test_subdirectory_module_use), &
5353
& new_unittest("invalid-subdirectory-module-use", &
5454
test_invalid_subdirectory_module_use, should_fail=.true.), &
55-
& new_unittest("tree-shake-module", &
55+
& new_unittest("tree-shake-module", &
5656
test_tree_shake_module, should_fail=.false.), &
57-
& new_unittest("tree-shake-subprogram-with-module", &
57+
& new_unittest("tree-shake-subprogram-with-module", &
5858
test_tree_shake_subprogram_with_module, should_fail=.false.) &
5959
]
60-
60+
6161
end subroutine collect_module_dependencies
6262

6363

@@ -74,6 +74,10 @@ subroutine test_library_module_use(error)
7474
allocate(model%packages(1))
7575
allocate(model%packages(1)%sources(2))
7676

77+
model%package_name = "test"
78+
model%build_prefix = ""
79+
model%packages(1)%name = "package1"
80+
7781
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1.f90", &
7882
scope = FPM_SCOPE_LIB, &
7983
provides=[string_t('my_mod_1')])
@@ -143,6 +147,10 @@ subroutine test_scope(exe_scope,error)
143147
allocate(model%packages(1))
144148
allocate(model%packages(1)%sources(2))
145149

150+
model%package_name = "test_scope"
151+
model%build_prefix = ""
152+
model%packages(1)%name = "package1"
153+
146154
scope_str = merge('FPM_SCOPE_APP ','FPM_SCOPE_TEST',exe_scope==FPM_SCOPE_APP)//' - '
147155

148156
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1.f90", &
@@ -201,6 +209,10 @@ subroutine test_program_with_module(error)
201209
allocate(model%packages(1))
202210
allocate(model%packages(1)%sources(1))
203211

212+
model%package_name = "test_program_with_module"
213+
model%build_prefix = ""
214+
model%packages(1)%name = "package1"
215+
204216
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_PROGRAM,file_name="app/my_program.f90", &
205217
scope = FPM_SCOPE_APP, &
206218
provides=[string_t('app_mod')], &
@@ -254,6 +266,10 @@ subroutine test_scope(exe_scope,error)
254266
allocate(model%packages(1))
255267
allocate(model%packages(1)%sources(3))
256268

269+
model%package_name = "test_scope"
270+
model%build_prefix = ""
271+
model%packages(1)%name = "package1"
272+
257273
scope_str = merge('FPM_SCOPE_APP ','FPM_SCOPE_TEST',exe_scope==FPM_SCOPE_APP)//' - '
258274

259275
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="app/app_mod1.f90", &
@@ -313,6 +329,10 @@ subroutine test_missing_library_use(error)
313329
allocate(model%packages(1))
314330
allocate(model%packages(1)%sources(2))
315331

332+
model%package_name = "test_missing_library_use"
333+
model%build_prefix = ""
334+
model%packages(1)%name = "package1"
335+
316336
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1.f90", &
317337
scope = FPM_SCOPE_LIB, &
318338
provides=[string_t('my_mod_1')])
@@ -340,6 +360,10 @@ subroutine test_missing_program_use(error)
340360
allocate(model%packages(1))
341361
allocate(model%packages(1)%sources(2))
342362

363+
model%package_name = "test_missing_program_use"
364+
model%build_prefix = ""
365+
model%packages(1)%name = "package1"
366+
343367
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1.f90", &
344368
scope = FPM_SCOPE_LIB, &
345369
provides=[string_t('my_mod_1')])
@@ -366,6 +390,10 @@ subroutine test_invalid_library_use(error)
366390
allocate(model%packages(1))
367391
allocate(model%packages(1)%sources(2))
368392

393+
model%package_name = "test_invalid_library_use"
394+
model%build_prefix = ""
395+
model%packages(1)%name = "package1"
396+
369397
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="app/app_mod.f90", &
370398
scope = FPM_SCOPE_APP, &
371399
provides=[string_t('app_mod')])
@@ -393,6 +421,10 @@ subroutine test_subdirectory_module_use(error)
393421
allocate(model%packages(1))
394422
allocate(model%packages(1)%sources(2))
395423

424+
model%package_name = "test_subdirectory_module_use"
425+
model%build_prefix = ""
426+
model%packages(1)%name = "package1"
427+
396428
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="app/subdir/app_mod.f90", &
397429
scope = FPM_SCOPE_APP, &
398430
provides=[string_t('app_mod')])
@@ -416,6 +448,10 @@ subroutine test_package_with_no_module_duplicates(error)
416448
allocate(model%packages(1))
417449
allocate(model%packages(1)%sources(2))
418450

451+
model%package_name = "test_package_with_no_module_duplicates"
452+
model%build_prefix = ""
453+
model%packages(1)%name = "package1"
454+
419455
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1.f90", &
420456
scope = FPM_SCOPE_LIB, provides=[string_t('my_mod_1')])
421457

@@ -440,6 +476,10 @@ subroutine test_package_module_duplicates_same_source(error)
440476
allocate(model%packages(1))
441477
allocate(model%packages(1)%sources(1))
442478

479+
model%package_name = "test_package_module_duplicates_same_source"
480+
model%build_prefix = ""
481+
model%packages(1)%name = "package1"
482+
443483
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1.f90", &
444484
scope = FPM_SCOPE_LIB, provides=[string_t('my_mod_1'), string_t('my_mod_1')])
445485

@@ -461,6 +501,10 @@ subroutine test_package_module_duplicates_one_package(error)
461501
allocate(model%packages(1))
462502
allocate(model%packages(1)%sources(2))
463503

504+
model%package_name = "test_package_module_duplicates_one_package"
505+
model%build_prefix = ""
506+
model%packages(1)%name = "package1"
507+
464508
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1_a.f90", &
465509
scope = FPM_SCOPE_LIB, provides=[string_t('my_mod_1')])
466510

@@ -486,6 +530,11 @@ subroutine test_package_module_duplicates_two_packages(error)
486530
allocate(model%packages(1)%sources(1))
487531
allocate(model%packages(2)%sources(1))
488532

533+
model%package_name = "test_package_module_duplicates_two_packages"
534+
model%build_prefix = ""
535+
model%packages(1)%name = "package1"
536+
model%packages(2)%name = "package2"
537+
489538
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/subdir1/my_mod_1.f90", &
490539
scope = FPM_SCOPE_LIB, provides=[string_t('my_mod_1')])
491540

@@ -515,6 +564,10 @@ subroutine test_tree_shake_module(error)
515564
allocate(model%packages(1))
516565
allocate(model%packages(1)%sources(4))
517566

567+
model%package_name = "test_tree_shake_module"
568+
model%build_prefix = ""
569+
model%packages(1)%name = "package1"
570+
518571
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1.f90", &
519572
scope = FPM_SCOPE_LIB, &
520573
provides=[string_t('my_mod_1')]) ! indirectly used
@@ -586,6 +639,10 @@ subroutine test_tree_shake_subprogram_with_module(error)
586639
allocate(model%packages(1))
587640
allocate(model%packages(1)%sources(4))
588641

642+
model%package_name = "test_tree_shake_subprogram_with_module"
643+
model%build_prefix = ""
644+
model%packages(1)%name = "package1"
645+
589646
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="src/my_mod_1.f90", &
590647
scope = FPM_SCOPE_LIB, &
591648
provides=[string_t('my_mod_1')]) ! used via subprogram
@@ -652,6 +709,10 @@ subroutine test_invalid_subdirectory_module_use(error)
652709
allocate(model%packages(1))
653710
allocate(model%packages(1)%sources(2))
654711

712+
model%package_name = "test_invalid_subdirectory_module_use"
713+
model%build_prefix = ""
714+
model%packages(1)%name = "package1"
715+
655716
model%packages(1)%sources(1) = new_test_source(FPM_UNIT_MODULE,file_name="app/diff_dir/app_mod.f90", &
656717
scope = FPM_SCOPE_APP, &
657718
provides=[string_t('app_mod')])

0 commit comments

Comments
 (0)