Changeset 9eb1ff5 in mainline for uspace/lib/pcut/tests/timeout.c

Timestamp:

2017-12-08T14:47:08Z (8 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

c1694b6b

Parents:

6fb8b2c

Message:

Update PCUT

Updated PCUT to commit 7ce059f.

Notable changes include:

• overall summary is printed when tests finish
• when tests passed, the status message does not use the word 'failure'
• program exit code is zero only when all tests passed

These changes fixes tickets 713 and 714.

​http://www.helenos.org/ticket/713
​http://www.helenos.org/ticket/714

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
 }