Changeset 231b3fd in mainline for uspace/lib/pcut/src/os/helenos.c

Timestamp:

2018-08-25T21:35:26Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

• uspace/lib/pcut/src/os/helenos.c (modified) (1 diff)

uspace/lib/pcut/src/os/helenos.c

@@ -141 +141 @@
         pcut_item_t *test = arg;
         int timeout_sec = pcut_get_test_timeout(test);
-        suseconds_t timeout_us = (suseconds_t) timeout_sec * 1000 * 1000;
+        usec_t timeout_us = SEC2USEC(timeout_sec);
 
         fibril_mutex_lock(&forced_termination_mutex);