Changeset 371bd7d in mainline for uspace/app/tester/tester.c

Timestamp:

2010-03-27T09:22:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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 mainline changes.

File:

• uspace/app/tester/tester.c (modified) (3 diffs)

uspace/app/tester/tester.c

@@ -38 +38 @@
 #include <unistd.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 #include "tester.h"
 
@@ -56 +56 @@
 #include "fault/fault1.def"
 #include "fault/fault2.def"
+#include "fault/fault3.def"
 #include "vfs/vfs1.def"
 #include "ipc/ping_pong.def"
@@ -68 +69 @@
 {
         /* Execute the test */
-        char *ret = test->entry();
+        const char *ret = test->entry();
         
         if (ret == NULL) {