Changeset 3375bd4 in mainline for uspace/app/tester

Timestamp:

2011-05-17T07:44:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (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

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

Location:

uspace/app/tester

Files:

• Makefile (modified) (1 diff)
• mm/malloc2.c (added)
• mm/malloc2.def (added)
• tester.c (modified) (1 diff)
• tester.h (modified) (1 diff)

uspace/app/tester/Makefile

@@ -49 +49 @@
         loop/loop1.c \
         mm/malloc1.c \
+        mm/malloc2.c \
         mm/mapping1.c \
         devs/devman1.c \

uspace/app/tester/tester.c

@@ -62 +62 @@
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
+#include "mm/malloc2.def"
 #include "mm/mapping1.def"
 #include "hw/serial/serial1.def"

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_mapping1(void);
 extern const char *test_serial1(void);