Update from fortuno-repos/fortuno@7d9684c

.github/workflows/ci.yml

@@ -42,4 +42,4 @@ jobs:
 
       - name: Test fpm export
         run: |
-          fpm run -C test/export/${INTERFACE} testapp
+          fpm run -C test/export/${INTERFACE} testapp testapp_fpp

include/fortuno_serial.fpp

@@ -0,0 +1,34 @@
+! This file is part of Fortuno.
+! Licensed under the BSD-2-Clause Plus Patent license.
+! SPDX-License-Identifier: BSD-2-Clause-Patent
+
+#ifndef __FORTUNO_SERIAL_FPP__
+#define __FORTUNO_SERIAL_FPP__
+
+#define CHECK(cond)\
+  block;\
+    use fortuno_serial, only : serial_check;\
+    call serial_check(cond, file=__FILE__, line=__LINE__);\
+  end block;
+
+#define CHECK_MSG(cond, msg)\
+  block;\
+    use fortuno_serial, only : serial_check;\
+    call serial_check(cond, msg, file=__FILE__, line=__LINE__);\
+  end block;
+
+#define ASSERT(cond)\
+  block;\
+    use fortuno_serial, only : serial_check, serial_check_failed;\
+    call serial_check(cond, file=__FILE__, line=__LINE__);\
+    if (serial_check_failed()) return;\
+  end block;
+
+#define ASSERT_MSG(cond, msg)\
+  block;\
+    use fortuno_serial, only : serial_check, serial_check_failed;\
+    call serial_check(cond, msg, file=__FILE__, line=__LINE__);\
+    if (serial_check_failed()) return;\
+  end block;
+
+#endif

test/export/serial/app/testapp_fpp.F90

@@ -6,12 +6,9 @@
 
 !> Unit tests
 module testapp_fpp_tests
-  use fortuno_serial, only : is_equal, test => serial_case_item, test_item
+  use fortuno_serial, only : is_equal, test => serial_case_item, test_list
   implicit none
 
-  private
-  public :: test_items
-
 contains
 
 
@@ -20,24 +17,24 @@ subroutine test_success()
   end subroutine test_success
 
 
-  function test_items() result(testitems)
-    type(test_item), allocatable :: testitems(:)
+  function tests()
+    type(test_list) :: tests
 
-    testitems = [&
+    tests = test_list([&
         test("success", test_success)&
-    ]
+    ])
 
-  end function test_items
+  end function tests
 
 end module testapp_fpp_tests
 
 
 !> Test app driving Fortuno unit tests
 program testapp_fpp
-  use testapp_fpp_tests, only : test_items
   use fortuno_serial, only : execute_serial_cmd_app
+  use testapp_fpp_tests, only : tests
   implicit none
 
-  call execute_serial_cmd_app(testitems=test_items())
+  call execute_serial_cmd_app(tests())
 
 end program testapp_fpp

test/export/serial/fpm.toml

@@ -24,4 +24,8 @@ fortuno = { path = "../../../" }
 
 [[executable]]
 name = "testapp"
-main = "testapp.f90"
+main = "testapp.f90"
+
+[[executable]]
+name = "testapp_fpp"
+main = "testapp_fpp.F90"