Changeset 132ab5d1 in mainline for uspace/lib/pcut/tests/timeout.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/pcut/tests/timeout.c (modified) (2 diffs)

uspace/lib/pcut/tests/timeout.c

@@ -29 +29 @@
 #include <pcut/pcut.h>
 
+#ifdef __helenos__
+#include <thread.h>
+#else
 #ifdef __unix
-// FIXME
-#include <thread.h>
+#include <unistd.h>
 #endif
 #if defined(__WIN64) || defined(__WIN32) || defined(_WIN32)
 #include <windows.h>
+#endif
 #endif
 
@@ -41 +44 @@
 
 static void my_sleep(int sec) {
+#ifdef __helenos__
+        thread_sleep(sec);
+#else
 #ifdef __unix
-// FIXME
-        thread_sleep(sec);
+        sleep(sec);
 #endif
 #if defined(__WIN64) || defined(__WIN32) || defined(_WIN32)
         Sleep(1000 * sec);
+#endif
 #endif
 }