@micro-os-plus/micro-test-plus 3.0.0 → 3.1.0

package/include/micro-os-plus/test-suite.h

@@ -197,10 +197,10 @@ namespace micro_os_plus::micro_test_plus
     } current_test_case{};
   };
 
-  template <typename Callable_T, typename... Args_T>
   class test_suite : public test_suite_base
   {
   public:
+    template <typename Callable_T, typename... Args_T>
     test_suite (const char* name, Callable_T&& callable,
                 Args_T&&... arguments);
 
@@ -220,8 +220,7 @@ namespace micro_os_plus::micro_test_plus
     run (void) override;
 
   protected:
-    Callable_T&& callable_;
-    std::tuple<Args_T...> arguments_;
+    std::function<void (void)> callable_;
   };
 
   // --------------------------------------------------------------------------

package/meson.build

@@ -16,7 +16,7 @@
 #
 # `subdir('xpacks/micro-os-plus-micro-test-plus')`
 #
-# The result is a library and a dependency that can be refered as:
+# The result is a library and a dependency that can be referred as:
 #
 # `dependencies: [micro_os_plus_micro_test_plus_dependency],`
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@micro-os-plus/micro-test-plus",
-  "version": "3.0.0",
-  "description": "A source library xPack with µTest++, a testing framework for embedded platforms",
+  "version": "3.1.0",
+  "description": "A source library xPack with µTest++, a lightweight testing framework for embedded platforms",
   "main": "",
   "scripts": {
     "npm-install": "npm install",
@@ -37,7 +37,7 @@
     "@xpack-dev-tools/cmake": "3.21.6-1.1",
     "@xpack-dev-tools/meson-build": "0.60.3-1.1",
     "@xpack-dev-tools/ninja-build": "1.10.2-5.1",
-    "@micro-os-plus/build-helper": "2.6.3",
+    "@micro-os-plus/build-helper": "2.7.1",
     "@micro-os-plus/diag-trace": "3.0.0"
   },
   "xpack": {
@@ -597,7 +597,7 @@
             "xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
             "xpm link --config {{ configuration.name }} @micro-os-plus/startup",
             "xpm link --config {{ configuration.name }} @micro-os-plus/version",
-            "xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core-m"
+            "xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core"
           ],
           "prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
           "build": [
@@ -618,7 +618,7 @@
           "@micro-os-plus/semihosting": "4.0.0",
           "@micro-os-plus/startup": "3.0.0",
           "@micro-os-plus/version": "7.1.2",
-          "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
+          "@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
         }
       },
       "qemu-mps2-an386-cmake-release": {
@@ -641,7 +641,7 @@
             "xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
             "xpm link --config {{ configuration.name }} @micro-os-plus/startup",
             "xpm link --config {{ configuration.name }} @micro-os-plus/version",
-            "xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core-m"
+            "xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core"
           ],
           "prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
           "build": [
@@ -662,7 +662,7 @@
           "@micro-os-plus/semihosting": "4.0.0",
           "@micro-os-plus/startup": "3.0.0",
           "@micro-os-plus/version": "7.1.2",
-          "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
+          "@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
         }
       },
       "qemu-mps2-an386-meson-debug": {
@@ -682,7 +682,7 @@
             "xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
             "xpm link --config {{ configuration.name }} @micro-os-plus/startup",
             "xpm link --config {{ configuration.name }} @micro-os-plus/version",
-            "xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core-m"
+            "xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core"
           ],
           "prepare": "{{ properties.commandMesonPrepareCross }}",
           "build": [
@@ -703,7 +703,7 @@
           "@micro-os-plus/semihosting": "4.0.0",
           "@micro-os-plus/startup": "3.0.0",
           "@micro-os-plus/version": "7.1.2",
-          "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
+          "@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
         }
       },
       "qemu-mps2-an386-meson-release": {
@@ -723,7 +723,7 @@
             "xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
             "xpm link --config {{ configuration.name }} @micro-os-plus/startup",
             "xpm link --config {{ configuration.name }} @micro-os-plus/version",
-            "xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core-m"
+            "xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core"
           ],
           "prepare": "{{ properties.commandMesonPrepareCross }}",
           "build": [
@@ -744,7 +744,7 @@
           "@micro-os-plus/semihosting": "4.0.0",
           "@micro-os-plus/startup": "3.0.0",
           "@micro-os-plus/version": "7.1.2",
-          "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
+          "@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
         }
       },
       "stm32f4discovery-cmake-debug": {
@@ -786,7 +786,7 @@
           "@micro-os-plus/semihosting": "4.0.0",
           "@micro-os-plus/startup": "3.0.0",
           "@micro-os-plus/version": "7.1.2",
-          "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
+          "@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
         }
       },
       "stm32f4discovery-cmake-release": {
@@ -828,7 +828,7 @@
           "@micro-os-plus/semihosting": "4.0.0",
           "@micro-os-plus/startup": "3.0.0",
           "@micro-os-plus/version": "7.1.2",
-          "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
+          "@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
         }
       },
       "stm32f4discovery-meson-debug": {
@@ -871,7 +871,7 @@
           "@micro-os-plus/semihosting": "4.0.0",
           "@micro-os-plus/startup": "3.0.0",
           "@micro-os-plus/version": "7.1.2",
-          "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
+          "@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
         }
       },
       "stm32f4discovery-meson-release": {
@@ -914,7 +914,7 @@
           "@micro-os-plus/semihosting": "4.0.0",
           "@micro-os-plus/startup": "3.0.0",
           "@micro-os-plus/version": "7.1.2",
-          "@xpack-3rd-party/arm-cmsis-core-m": "5.4.0-5"
+          "@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
         }
       }
     }

package/src/test-runner.cpp

@@ -103,11 +103,14 @@ namespace micro_os_plus::micro_test_plus
 #else
         printf ("Built with an unknown compiler");
 #endif
-#if defined(__ARM_PCS_VFP)
+#if !(defined(__APPLE__) || defined(__linux__) || defined(__unix__) || defined(WIN32))
+// This is relevant only on bare-metal.
+#if defined(__ARM_PCS_VFP) || defined(__ARM_FP)
         printf (", with FP");
 #else
         printf (", no FP");
 #endif
+#endif
 #if defined(__EXCEPTIONS)
         printf (", with exceptions");
 #else
@@ -144,8 +147,11 @@ namespace micro_os_plus::micro_test_plus
       {
         for (auto suite : *suites_)
           {
-            default_test_suite_ = suite;
+            current_test_suite = suite;
+
+            suite->begin_test_suite ();
             suite->run ();
+            suite->end_test_suite();
 
             was_successful &= suite->was_successful ();
           }

package/src/test-suite.cpp

@@ -111,6 +111,22 @@ namespace micro_os_plus::micro_test_plus
     ++current_test_case.failed_checks;
   }
 
+  // ==========================================================================
+
+  void
+  test_suite::run (void)
+  {
+    // Run the test suite function prepared with std::bin();
+    callable_ ();
+  }
+
+  test_suite::~test_suite ()
+  {
+#if defined(MICRO_TEST_PLUS_TRACE)
+    printf ("%s\n", __PRETTY_FUNCTION__);
+#endif // MICRO_TEST_PLUS_TRACE
+  }
+
   // --------------------------------------------------------------------------
 } // namespace micro_os_plus::micro_test_plus
 

package/docs/NOTES.md

@@ -1,7 +0,0 @@
-# Notes
-
-## Inspiration
-
-- <https://github.com/boost-ext/ut>
-- <https://google.github.io/googletest/>
-- <https://github.com/catchorg/Catch2>