Changeset 4b54bd9 in mainline for uspace/lib/pcut/src/run.c

Timestamp:

2018-09-12T13:23:03Z (6 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3da0ee4

Parents:

275530a4

Message:

Update PCUT to latest revision

File:

• uspace/lib/pcut/src/run.c (modified) (12 diffs)

uspace/lib/pcut/src/run.c

@@ -33 +33 @@
 
 #include "internal.h"
+
 #ifndef PCUT_NO_LONG_JUMP
+#pragma warning(push, 0)
 #include <setjmp.h>
+#pragma warning(pop)
 #endif
 
@@ -73 +76 @@
 static int default_suite_initialized = 0;
 
-static void init_default_suite_when_needed()
-{
+static void init_default_suite_when_needed() {
         if (default_suite_initialized) {
                 return;
@@ -92 +94 @@
  * @return Always a valid test suite item.
  */
-static pcut_item_t *pcut_find_parent_suite(pcut_item_t *it)
-{
+static pcut_item_t *pcut_find_parent_suite(pcut_item_t *it) {
         while (it != NULL) {
                 if (it->kind == PCUT_KIND_TESTSUITE) {
@@ -108 +109 @@
  * @param func Function to run (can be NULL).
  */
-static void run_setup_teardown(pcut_setup_func_t func)
-{
+static void run_setup_teardown(pcut_setup_func_t func) {
         if (func != NULL) {
                 func();
@@ -122 +122 @@
  * @param outcome Outcome of the current test.
  */
-static void leave_test(int outcome)
-{
+static void leave_test(int outcome) {
         PCUT_DEBUG("leave_test(outcome=%d), will_exit=%s", outcome,
-            leave_means_exit ? "yes" : "no");
+                leave_means_exit ? "yes" : "no");
         if (leave_means_exit) {
                 exit(outcome);
@@ -142 +141 @@
  * @param message Message describing the failure.
  */
-void pcut_failed_assertion(const char *message)
-{
+void pcut_failed_assertion(const char *message) {
         static const char *prev_message = NULL;
         /*
@@ -162 +160 @@
                 if (report_test_result) {
                         pcut_report_test_done(current_test, PCUT_OUTCOME_FAIL,
-                            message, NULL, NULL);
+                                message, NULL, NULL);
                 }
         } else {
                 if (report_test_result) {
                         pcut_report_test_done(current_test, PCUT_OUTCOME_FAIL,
-                            prev_message, message, NULL);
+                                prev_message, message, NULL);
                 }
         }
@@ -181 +179 @@
  * @return Error status (zero means success).
  */
-static int run_test(pcut_item_t *test)
-{
+static int run_test(pcut_item_t *test) {
         /*
          * Set here as the returning point in case of test failure.
@@ -234 +231 @@
         if (report_test_result) {
                 pcut_report_test_done(current_test, PCUT_OUTCOME_PASS,
-                    NULL, NULL, NULL);
+                        NULL, NULL, NULL);
         }
 
@@ -248 +245 @@
  * @return Error status (zero means success).
  */
-int pcut_run_test_forked(pcut_item_t *test)
-{
+int pcut_run_test_forked(pcut_item_t *test) {
         int rc;
 
@@ -272 +268 @@
  * @return Error status (zero means success).
  */
-int pcut_run_test_single(pcut_item_t *test)
-{
+int pcut_run_test_single(pcut_item_t *test) {
         int rc;
 
@@ -293 +288 @@
  * @return Timeout in seconds.
  */
-int pcut_get_test_timeout(pcut_item_t *test)
-{
+int pcut_get_test_timeout(pcut_item_t *test) {
         int timeout = PCUT_DEFAULT_TEST_TIMEOUT;
         pcut_extra_t *extras = test->extras;