feat: shared and static library targets (#1138)

Author: perazz

.gitignore

@@ -6,3 +6,6 @@ build/*
 # CodeBlocks
 project/
 
+# Temporary files
+*.swp
+

ci/run_tests.sh

@@ -310,5 +310,39 @@ fi
 
 popd
 
+# Test shared library dependencies
+pushd shared_lib
+"$fpm" build || EXIT_CODE=$?
+test $EXIT_CODE -eq 0
+popd
+
+pushd shared_lib_extra
+"$fpm" build || EXIT_CODE=$?
+test $EXIT_CODE -eq 0
+popd
+
+pushd shared_lib_empty
+"$fpm" build
+"$fpm" run
+"$fpm" test
+popd
+
+pushd static_lib_empty
+"$fpm" build
+"$fpm" run
+"$fpm" test
+popd
+
+pushd shared_app_only
+"$fpm" test || EXIT_CODE=$?
+test $EXIT_CODE -eq 0
+popd
+
+# Static library dependencies
+pushd static_app_only
+"$fpm" test || EXIT_CODE=$?
+test $EXIT_CODE -eq 0
+popd
+
 # Cleanup
 rm -rf ./*/build

example_packages/shared_app_only/app/main.f90

@@ -0,0 +1,4 @@
+program main
+  use testdrive
+  print *, 'Hello, world!'
+end program main

example_packages/shared_app_only/fpm.toml

@@ -0,0 +1,8 @@
+# App only, use shared lib from other folder
+name = "shared_app_only"
+library.type="shared"
+install.library=true
+[dependencies]
+shared_lib_extra = { path = "../shared_lib_extra" }
+[dev-dependencies]
+test-drive = { git = "https://github.com/fortran-lang/test-drive", tag="v0.5.0" }

example_packages/shared_app_only/test/test.f90

@@ -0,0 +1,50 @@
+module test_shared_lib
+    use testdrive, only : new_unittest, unittest_type, error_type, check
+    use shared_lib, only: test_something
+
+    implicit none
+
+    public :: collect
+
+
+contains
+
+    !> Collect all exported unit tests
+    subroutine collect(testsuite)
+        !> Collection of tests
+        type(unittest_type), allocatable, intent(out) :: testsuite(:)
+
+        testsuite = [ new_unittest("shared_lib", test_shared) ]
+
+    end subroutine collect
+
+    subroutine test_shared(error)
+        type(error_type), allocatable, intent(out) :: error
+        
+        call check(error, test_something(), 123, "Should be test_something==123")
+        
+    end subroutine test_shared 
+
+end module test_shared_lib
+
+program tester
+    use, intrinsic :: iso_fortran_env, only : error_unit
+    use testdrive, only : run_testsuite, new_testsuite, testsuite_type
+    use test_shared_lib, only : collect
+    implicit none
+    integer :: stat
+    type(testsuite_type), allocatable :: testsuite
+    character(len=*), parameter :: fmt = '("#", *(1x, a))'
+
+    stat = 0
+
+    testsuite = new_testsuite("shared_lib", collect)
+
+    write(error_unit, fmt) "Testing:", testsuite%name
+    call run_testsuite(testsuite%collect, error_unit, stat)
+
+    if (stat > 0) then
+        write(error_unit, '(i0, 1x, a)') stat, "test(s) failed!"
+        error stop 
+    end if
+end program tester

example_packages/shared_lib/fpm.toml

@@ -0,0 +1,3 @@
+# Shared library with no executables
+name = "shared_lib"
+library.type="shared"

example_packages/shared_lib/src/shared_lib.f90

@@ -0,0 +1,14 @@
+module shared_lib
+  implicit none
+  private
+
+  public :: say_hello
+  public :: test_something
+contains
+  subroutine say_hello
+    print *, "Hello, shared_lib!"
+  end subroutine say_hello
+  integer function test_something()
+     test_something = 123
+  end function test_something
+end module shared_lib

example_packages/shared_lib_empty/fpm.toml

@@ -0,0 +1,5 @@
+name = "shared_lib_empty"
+library.type="shared"
+[dependencies]
+shared_lib = { path = "../shared_lib" }
+shared_app_only = { path = "../shared_app_only" }

example_packages/shared_lib_extra/fpm.toml

@@ -0,0 +1,4 @@
+name = "shared_lib_extra"
+library.type="shared"
+[dependencies]
+shared_lib = { path = "../shared_lib" }

example_packages/shared_lib_extra/src/shared_lib_extra.f90

@@ -0,0 +1,10 @@
+module shared_lib_extra
+  implicit none
+  private
+
+  public :: say_extra_hello
+contains
+  subroutine say_extra_hello
+    print *, "Hello, shared_lib_extra!"
+  end subroutine say_extra_hello
+end module shared_lib_extra

example_packages/static_app_only/app/main.f90

@@ -0,0 +1,4 @@
+program main
+  use testdrive
+  print *, 'Hello, world!'
+end program main

example_packages/static_app_only/fpm.toml

@@ -0,0 +1,8 @@
+# App only, use shared libs from other folder, no provided sources
+name = "static_app_only"
+library.type="static"
+install.library=true
+[dependencies]
+shared_lib_extra = { path = "../shared_lib_extra" }
+[dev-dependencies]
+test-drive = { git = "https://github.com/fortran-lang/test-drive", tag="v0.5.0" }

example_packages/static_app_only/test/test.f90

@@ -0,0 +1,50 @@
+module test_shared_lib
+    use testdrive, only : new_unittest, unittest_type, error_type, check
+    use shared_lib, only: test_something
+
+    implicit none
+
+    public :: collect
+
+
+contains
+
+    !> Collect all exported unit tests
+    subroutine collect(testsuite)
+        !> Collection of tests
+        type(unittest_type), allocatable, intent(out) :: testsuite(:)
+
+        testsuite = [ new_unittest("shared_lib", test_shared) ]
+
+    end subroutine collect
+
+    subroutine test_shared(error)
+        type(error_type), allocatable, intent(out) :: error
+        
+        call check(error, test_something(), 123, "Should be test_something==123")
+        
+    end subroutine test_shared 
+
+end module test_shared_lib
+
+program tester
+    use, intrinsic :: iso_fortran_env, only : error_unit
+    use testdrive, only : run_testsuite, new_testsuite, testsuite_type
+    use test_shared_lib, only : collect
+    implicit none
+    integer :: stat
+    type(testsuite_type), allocatable :: testsuite
+    character(len=*), parameter :: fmt = '("#", *(1x, a))'
+
+    stat = 0
+
+    testsuite = new_testsuite("shared_lib", collect)
+
+    write(error_unit, fmt) "Testing:", testsuite%name
+    call run_testsuite(testsuite%collect, error_unit, stat)
+
+    if (stat > 0) then
+        write(error_unit, '(i0, 1x, a)') stat, "test(s) failed!"
+        error stop 
+    end if
+end program tester

example_packages/static_lib_empty/fpm.toml

@@ -0,0 +1,5 @@
+name = "static_lib_empty"
+library.type="static"
+[dependencies]
+shared_lib = { path = "../shared_lib" }
+shared_app_only = { path = "../shared_app_only" }