Changeset 694ca93f in mainline for uspace/app/tester

Timestamp:

2011-05-01T19:34:26Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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

Location:

uspace/app/tester

Files:

• Makefile (modified) (1 diff)
• devs/devman1.c (added)
• devs/devman1.def (added)
• fault/fault2.c (modified) (2 diffs)
• mm/malloc2.c (added)
• mm/malloc2.def (added)
• tester.c (modified) (1 diff)
• tester.h (modified) (1 diff)

uspace/app/tester/Makefile

@@ -52 +52 @@
         loop/loop1.c \
         mm/malloc1.c \
+        mm/malloc2.c \
+        devs/devman1.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c \

uspace/app/tester/fault/fault2.c

@@ -29 +29 @@
 
 #include "../tester.h"
+#include <stdio.h>
 
 typedef int __attribute__((may_alias)) aliasing_int;
@@ -38 +39 @@
         
         var1 = *((aliasing_int *) (((char *) (&var)) + 1));
+        printf("Read %d\n", var1);
         
         return "Survived unaligned read";

uspace/app/tester/tester.c

@@ -62 +62 @@
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
+#include "mm/malloc2.def"
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"
 #include "libext2/libext2_1.def"
+#include "devs/devman1.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

@@ -78 +78 @@
 extern const char *test_loop1(void);
 extern const char *test_malloc1(void);
+extern const char *test_malloc2(void);
 extern const char *test_serial1(void);
 extern const char *test_virtchar1(void);
 extern const char *test_libext2_1(void);
+extern const char *test_devman1(void);
 
 extern test_t tests[];